- Implemented quest POI's. May be not perfect, but it works :P

src/game/ObjectMgr.cpp

@@ -6380,6 +6380,65 @@ void ObjectMgr::LoadPointsOfInterest()
     sLog.outString(">> Loaded %u Points of Interest definitions", count);
 }
 
+void ObjectMgr::LoadQuestPOI()
+{
+    uint32 count = 0;
+
+    //                                                0        1         2      3
+    QueryResult *result = WorldDatabase.Query("SELECT questId, objIndex, mapId, unk1 FROM quest_poi");
+
+    if(!result)
+    {
+        barGoLink bar(1);
+
+        bar.step();
+
+        sLog.outString();
+        sLog.outErrorDb(">> Loaded 0 quest POI definitions. DB table `quest_poi` is empty.");
+        return;
+    }
+
+    barGoLink bar(result->GetRowCount());
+
+    do
+    {
+        Field *fields = result->Fetch();
+        bar.step();
+
+        uint32 questId  = fields[0].GetUInt32();
+        int32 objIndex  = fields[1].GetInt32();
+        uint32 mapId    = fields[2].GetUInt32();
+        uint32 unk1     = fields[3].GetUInt32();
+
+        QuestPOI POI(objIndex, mapId, unk1);
+
+        QueryResult *points = WorldDatabase.PQuery("SELECT x, y FROM quest_poi_points WHERE questId='%u' AND objIndex='%i'", questId, objIndex);
+
+        if(points)
+        {
+            do 
+            {
+                Field *pointFields = points->Fetch();
+                int32 x = pointFields[0].GetInt32();
+                int32 y = pointFields[1].GetInt32();
+                QuestPOIPoint point(x, y);
+                POI.points.push_back(point);
+            } while (points->NextRow());
+
+            delete points;
+        }
+
+        mQuestPOIMap[questId].push_back(POI);
+
+        ++count;
+    } while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u quest POI definitions", count);
+}
+
 void ObjectMgr::LoadNPCSpellClickSpells()
 {
     uint32 count = 0;

src/game/ObjectMgr.h

@@ -216,6 +216,29 @@ struct PointOfInterest
     std::string icon_name;
 };
 
+struct QuestPOIPoint
+{
+    int32 x;
+    int32 y;
+
+    QuestPOIPoint() : x(0), y(0) {}
+    QuestPOIPoint(int32 _x, int32 _y) : x(_x), y(_y) {}
+};
+
+struct QuestPOI
+{
+    int32 ObjectiveIndex;
+    uint32 MapId;
+    uint32 Unk1;
+    std::vector<QuestPOIPoint> points;
+
+    QuestPOI() : ObjectiveIndex(0), MapId(0), Unk1(0) {}
+    QuestPOI(int32 objIndex, uint32 mapId, uint32 unk1) : ObjectiveIndex(objIndex), MapId(mapId), Unk1(unk1) {}
+};
+
+typedef std::vector<QuestPOI> QuestPOIVector;
+typedef UNORDERED_MAP<uint32, QuestPOIVector> QuestPOIMap;
+
 #define WEATHER_SEASONS 4
 struct WeatherSeasonChances
 {
@@ -479,6 +502,14 @@ class ObjectMgr
             return NULL;
         }
 
+        QuestPOIVector const* GetQuestPOIVector(uint32 questId)
+        {
+            QuestPOIMap::const_iterator itr = mQuestPOIMap.find(questId);
+            if(itr != mQuestPOIMap.end())
+                return &itr->second;
+            return NULL;
+        }
+
         void LoadGuilds();
         void LoadArenaTeams();
         void LoadGroups();
@@ -551,6 +582,7 @@ class ObjectMgr
 
         void LoadReputationOnKill();
         void LoadPointsOfInterest();
+        void LoadQuestPOI();
 
         void LoadNPCSpellClickSpells();
 
@@ -843,6 +875,8 @@ class ObjectMgr
 
         PointOfInterestMap mPointsOfInterest;
 
+        QuestPOIMap         mQuestPOIMap;
+
         WeatherZoneMap      mWeatherZoneMap;
 
         //character reserved names

src/game/QueryHandler.cpp

@@ -489,9 +489,66 @@ void WorldSession::HandleQueryQuestsCompleted( WorldPacket & recv_data )
 
 void WorldSession::HandleQuestPOIQuery(WorldPacket& recv_data)
 {
-    recv_data.read_skip<uint64>();
+    uint32 count;
+    recv_data >> count;                                     // quest count, max=25
 
-    WorldPacket data(SMSG_QUEST_POI_QUERY_RESPONSE, 4);
-    data << uint32(0);                                      // count
+    if(count >= MAX_QUEST_LOG_SIZE)
+        return;
+
+    WorldPacket data(SMSG_QUEST_POI_QUERY_RESPONSE, 4+(4+4)*count);
+    data << uint32(count);                                  // count
+
+    for(int i = 0; i < count; ++i)
+    {
+        uint32 questId;
+        recv_data >> questId;                               // quest id
+
+        bool questOk = false;
+
+        uint16 questSlot = _player->FindQuestSlot(questId);
+
+        if(questSlot != MAX_QUEST_LOG_SIZE)
+            questOk =_player->GetQuestSlotQuestId(questSlot) == questId;
+
+        if(questOk)
+        {
+            QuestPOIVector const *POI = sObjectMgr.GetQuestPOIVector(questId);
+
+            if(POI)
+            {
+                data << uint32(questId);                    // quest ID
+                data << uint32(POI->size());                // POI count
+
+                int index = 0;
+                for(QuestPOIVector::const_iterator itr = POI->begin(); itr != POI->end(); ++itr)
+                {
+                    data << uint32(index);                  // POI index
+                    data << int32(itr->ObjectiveIndex);     // objective index
+                    data << uint32(itr->MapId);             // mapid
+                    data << uint32(itr->Unk1);              // unknown
+                    data << uint32(itr->points.size());     // POI points count
+
+                    for(std::vector<QuestPOIPoint>::const_iterator itr2 = itr->points.begin(); itr2 != itr->points.end(); ++itr2)
+                    {
+                        data << int32(itr2->x);             // POI point x
+                        data << int32(itr2->y);             // POI point y
+                    }
+                    ++index;
+                }
+            }
+            else
+            {
+                data << uint32(questId);                    // quest ID
+                data << uint32(0);                          // POI count
+            }
+        }
+        else
+        {
+            data << uint32(questId);                        // quest ID
+            data << uint32(0);                              // POI count
+        }
+    }
+
+    data.hexlike();
     SendPacket(&data);
 }

src/game/World.cpp

@@ -1284,6 +1284,9 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading Quests..." );
     sObjectMgr.LoadQuests();                                    // must be loaded after DBCs, creature_template, item_template, gameobject tables
 
+    sLog.outString( "Loading Quest POI" );
+    sObjectMgr.LoadQuestPOI();
+
     sLog.outString( "Loading Quests Relations..." );
     sLog.outString();
     sObjectMgr.LoadQuestRelations();                            // must be after quest load