diff options
| author | Nay <dnpd.dd@gmail.com> | 2011-12-21 21:12:52 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2011-12-21 21:12:52 +0000 |
| commit | ed4a74690e2ad22aa39da5e648defd367b2bccbd (patch) | |
| tree | d0e0e572b4651b6a318751ae90fca770522ebbd9 /src | |
| parent | 968e50c0b1b23e64b7234908c81f89018f5f829c (diff) | |
Fix compile and a typo
Self reference: in C++ a number prefixed with a zero is treated as an octal number
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Creature/GossipDef.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index 10f52accdd0..d581891f997 100755 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -330,7 +330,7 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID, data << questObjectives; data << questGiverTextWindow; // 4.x data << questGiverTargetName; // 4.x - data << questGiverTextWindow; // 4.x + data << questTurnTextWindow; // 4.x data << questTurnTargetName; // 4.x data << uint32(quest->GetQuestGiverPortrait()); // 4.x data << uint32(quest->GetQuestTurnInPortrait()); // 4.x diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index c39062b8a32..00e67dc3507 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4456,16 +4456,16 @@ void ObjectMgr::LoadQuestLocales() { LocaleConstant locale = (LocaleConstant) i; - AddLocaleString(fields[1 + 11 * (i - 1) + 00].GetString(), locale, data.Title); - AddLocaleString(fields[1 + 11 * (i - 1) + 01].GetString(), locale, data.Details); - AddLocaleString(fields[1 + 11 * (i - 1) + 02].GetString(), locale, data.Objectives); - AddLocaleString(fields[1 + 11 * (i - 1) + 03].GetString(), locale, data.OfferRewardText); - AddLocaleString(fields[1 + 11 * (i - 1) + 04].GetString(), locale, data.RequestItemsText); - AddLocaleString(fields[1 + 11 * (i - 1) + 05].GetString(), locale, data.EndText); - AddLocaleString(fields[1 + 11 * (i - 1) + 06].GetString(), locale, data.CompletedText); - AddLocaleString(fields[1 + 11 * (i - 1) + 07].GetString(), locale, data.QuestGiverTextWindow); - AddLocaleString(fields[1 + 11 * (i - 1) + 08].GetString(), locale, data.QuestGiverTargetName); - AddLocaleString(fields[1 + 11 * (i - 1) + 09].GetString(), locale, data.QuestTurnTextWindow); + AddLocaleString(fields[1 + 11 * (i - 1)].GetString(), locale, data.Title); + AddLocaleString(fields[1 + 11 * (i - 1) + 1].GetString(), locale, data.Details); + AddLocaleString(fields[1 + 11 * (i - 1) + 2].GetString(), locale, data.Objectives); + AddLocaleString(fields[1 + 11 * (i - 1) + 3].GetString(), locale, data.OfferRewardText); + AddLocaleString(fields[1 + 11 * (i - 1) + 4].GetString(), locale, data.RequestItemsText); + AddLocaleString(fields[1 + 11 * (i - 1) + 5].GetString(), locale, data.EndText); + AddLocaleString(fields[1 + 11 * (i - 1) + 6].GetString(), locale, data.CompletedText); + AddLocaleString(fields[1 + 11 * (i - 1) + 7].GetString(), locale, data.QuestGiverTextWindow); + AddLocaleString(fields[1 + 11 * (i - 1) + 8].GetString(), locale, data.QuestGiverTargetName); + AddLocaleString(fields[1 + 11 * (i - 1) + 9].GetString(), locale, data.QuestTurnTextWindow); AddLocaleString(fields[1 + 11 * (i - 1) + 10].GetString(), locale, data.QuestTurnTargetName); for (uint8 k = 0; k < 4; ++k) |