diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-11 23:08:54 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-11 23:08:54 +0200 |
| commit | cfe644b457a8262d7cd4ee613c7e05ea5b9a328b (patch) | |
| tree | 979aac5db19bd8157027da66c4bdb04cae462f2b /src/server/game/Quests/QuestDef.cpp | |
| parent | 37d2777f27ee4b6b319b64eba465a7932145dcb7 (diff) | |
| parent | 668ed58847ae25864c9f6c2e4fcd7144400faf83 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Maps/Map.cpp
src/server/game/Quests/QuestDef.cpp
Diffstat (limited to 'src/server/game/Quests/QuestDef.cpp')
| -rw-r--r-- | src/server/game/Quests/QuestDef.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 0f54e0af6c1..9a17175b1a8 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -162,7 +162,7 @@ Quest::Quest(Field* questRecord) for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) OfferRewardEmoteDelay[i] = questRecord[164+i].GetInt32(); - // int32 WDBVerified = questRecord[168].GetInt32(); + //int32 VerifiedBuild = questRecord[168].GetInt32(); if (SpecialFlags & QUEST_SPECIAL_FLAGS_AUTO_ACCEPT) Flags |= QUEST_FLAGS_AUTO_ACCEPT; |