diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index ce1cd5d6ea0..0a113095374 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -719,9 +719,10 @@ struct QuestPOIBlobPoint { int32 X; int32 Y; + int32 Z; - QuestPOIBlobPoint() : X(0), Y(0) { } - QuestPOIBlobPoint(int32 _X, int32 _Y) : X(_X), Y(_Y) { } + QuestPOIBlobPoint() : X(0), Y(0), Z(0) { } + QuestPOIBlobPoint(int32 x, int32 y) : X(x), Y(y), Z(0) { } }; struct QuestPOIBlobData @@ -736,24 +737,25 @@ struct QuestPOIBlobData int32 Flags; int32 WorldEffectID; int32 PlayerConditionID; + int32 NavigationPlayerConditionID; int32 SpawnTrackingID; - std::vector<QuestPOIBlobPoint> QuestPOIBlobPointStats; + std::vector<QuestPOIBlobPoint> Points; bool AlwaysAllowMergingBlobs; QuestPOIBlobData() : BlobIndex(0), ObjectiveIndex(0), QuestObjectiveID(0), QuestObjectID(0), MapID(0), UiMapID(0), Priority(0), Flags(0), WorldEffectID(0), - PlayerConditionID(0), SpawnTrackingID(0), AlwaysAllowMergingBlobs(false) { } + PlayerConditionID(0), NavigationPlayerConditionID(0), SpawnTrackingID(0), AlwaysAllowMergingBlobs(false) { } QuestPOIBlobData(int32 blobIndex, int32 objectiveIndex, int32 questObjectiveID, int32 questObjectID, int32 mapID, int32 uiMapID, int32 priority, - int32 flags, int32 worldEffectID, int32 playerConditionID, int32 spawnTrackingID, std::vector<QuestPOIBlobPoint> questPOIBlobPointStats, + int32 flags, int32 worldEffectID, int32 playerConditionID, int32 spawnTrackingID, std::vector<QuestPOIBlobPoint> points, bool alwaysAllowMergingBlobs) : BlobIndex(blobIndex), ObjectiveIndex(objectiveIndex), QuestObjectiveID(questObjectiveID), QuestObjectID(questObjectID), MapID(mapID), UiMapID(uiMapID), Priority(priority), Flags(flags), WorldEffectID(worldEffectID), - PlayerConditionID(playerConditionID), SpawnTrackingID(spawnTrackingID), QuestPOIBlobPointStats(std::move(questPOIBlobPointStats)), + PlayerConditionID(playerConditionID), NavigationPlayerConditionID(0), SpawnTrackingID(spawnTrackingID), Points(std::move(points)), AlwaysAllowMergingBlobs(alwaysAllowMergingBlobs) { } }; struct QuestPOIData { int32 QuestID = 0; - std::vector<QuestPOIBlobData> QuestPOIBlobDataStats; + std::vector<QuestPOIBlobData> Blobs; void InitializeQueryData(); ByteBuffer QueryDataBuffer; |