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
This commit is contained in:
commit
cfe644b457
24 files changed
+3667
-2453
No files matched your search
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user