aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/updates/world/4.x/2011_12_21_00_world_locales_quest_4x.sql34
-rwxr-xr-xsrc/server/game/Globals/ObjectMgr.cpp34
2 files changed, 53 insertions, 15 deletions
diff --git a/sql/updates/world/4.x/2011_12_21_00_world_locales_quest_4x.sql b/sql/updates/world/4.x/2011_12_21_00_world_locales_quest_4x.sql
new file mode 100644
index 00000000000..2a6cc73ebdc
--- /dev/null
+++ b/sql/updates/world/4.x/2011_12_21_00_world_locales_quest_4x.sql
@@ -0,0 +1,34 @@
+ALTER TABLE `locales_quest`
+ ADD `QuestGiverTextWindow_loc1` TEXT NULL DEFAULT NULL AFTER `ObjectiveText4_loc8`,
+ ADD `QuestGiverTextWindow_loc2` TEXT NULL DEFAULT NULL AFTER `QuestGiverTextWindow_loc1`,
+ ADD `QuestGiverTextWindow_loc3` TEXT NULL DEFAULT NULL AFTER `QuestGiverTextWindow_loc2`,
+ ADD `QuestGiverTextWindow_loc4` TEXT NULL DEFAULT NULL AFTER `QuestGiverTextWindow_loc3`,
+ ADD `QuestGiverTextWindow_loc5` TEXT NULL DEFAULT NULL AFTER `QuestGiverTextWindow_loc4`,
+ ADD `QuestGiverTextWindow_loc6` TEXT NULL DEFAULT NULL AFTER `QuestGiverTextWindow_loc5`,
+ ADD `QuestGiverTextWindow_loc7` TEXT NULL DEFAULT NULL AFTER `QuestGiverTextWindow_loc6`,
+ ADD `QuestGiverTextWindow_loc8` TEXT NULL DEFAULT NULL AFTER `QuestGiverTextWindow_loc7`,
+ ADD `QuestGiverTargetName_loc1` TEXT NULL DEFAULT NULL AFTER `QuestGiverTextWindow_loc8`,
+ ADD `QuestGiverTargetName_loc2` TEXT NULL DEFAULT NULL AFTER `QuestGiverTargetName_loc1`,
+ ADD `QuestGiverTargetName_loc3` TEXT NULL DEFAULT NULL AFTER `QuestGiverTargetName_loc2`,
+ ADD `QuestGiverTargetName_loc4` TEXT NULL DEFAULT NULL AFTER `QuestGiverTargetName_loc3`,
+ ADD `QuestGiverTargetName_loc5` TEXT NULL DEFAULT NULL AFTER `QuestGiverTargetName_loc4`,
+ ADD `QuestGiverTargetName_loc6` TEXT NULL DEFAULT NULL AFTER `QuestGiverTargetName_loc5`,
+ ADD `QuestGiverTargetName_loc7` TEXT NULL DEFAULT NULL AFTER `QuestGiverTargetName_loc6`,
+ ADD `QuestGiverTargetName_loc8` TEXT NULL DEFAULT NULL AFTER `QuestGiverTargetName_loc7`,
+ ADD `QuestTurnTextWindow_loc1` TEXT NULL DEFAULT NULL AFTER `QuestGiverTargetName_loc8`,
+ ADD `QuestTurnTextWindow_loc2` TEXT NULL DEFAULT NULL AFTER `QuestTurnTextWindow_loc1`,
+ ADD `QuestTurnTextWindow_loc3` TEXT NULL DEFAULT NULL AFTER `QuestTurnTextWindow_loc2`,
+ ADD `QuestTurnTextWindow_loc4` TEXT NULL DEFAULT NULL AFTER `QuestTurnTextWindow_loc3`,
+ ADD `QuestTurnTextWindow_loc5` TEXT NULL DEFAULT NULL AFTER `QuestTurnTextWindow_loc4`,
+ ADD `QuestTurnTextWindow_loc6` TEXT NULL DEFAULT NULL AFTER `QuestTurnTextWindow_loc5`,
+ ADD `QuestTurnTextWindow_loc7` TEXT NULL DEFAULT NULL AFTER `QuestTurnTextWindow_loc6`,
+ ADD `QuestTurnTextWindow_loc8` TEXT NULL DEFAULT NULL AFTER `QuestTurnTextWindow_loc7`,
+ ADD `QuestTurnTargetName_loc1` TEXT NULL DEFAULT NULL AFTER `QuestTurnTextWindow_loc8`,
+ ADD `QuestTurnTargetName_loc2` TEXT NULL DEFAULT NULL AFTER `QuestTurnTargetName_loc1`,
+ ADD `QuestTurnTargetName_loc3` TEXT NULL DEFAULT NULL AFTER `QuestTurnTargetName_loc2`,
+ ADD `QuestTurnTargetName_loc4` TEXT NULL DEFAULT NULL AFTER `QuestTurnTargetName_loc3`,
+ ADD `QuestTurnTargetName_loc5` TEXT NULL DEFAULT NULL AFTER `QuestTurnTargetName_loc4`,
+ ADD `QuestTurnTargetName_loc6` TEXT NULL DEFAULT NULL AFTER `QuestTurnTargetName_loc5`,
+ ADD `QuestTurnTargetName_loc7` TEXT NULL DEFAULT NULL AFTER `QuestTurnTargetName_loc6`,
+ ADD `QuestTurnTargetName_loc8` TEXT NULL DEFAULT NULL AFTER `QuestTurnTargetName_loc7`;
+ \ No newline at end of file
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 18f3e1a403c..ff7a9cc4b63 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -4431,14 +4431,14 @@ void ObjectMgr::LoadQuestLocales()
mQuestLocaleMap.clear(); // need for reload case
QueryResult result = WorldDatabase.Query("SELECT entry, "
- "Title_loc1, Details_loc1, Objectives_loc1, OfferRewardText_loc1, RequestItemsText_loc1, EndText_loc1, CompletedText_loc1, ObjectiveText1_loc1, ObjectiveText2_loc1, ObjectiveText3_loc1, ObjectiveText4_loc1, "
- "Title_loc2, Details_loc2, Objectives_loc2, OfferRewardText_loc2, RequestItemsText_loc2, EndText_loc2, CompletedText_loc2, ObjectiveText1_loc2, ObjectiveText2_loc2, ObjectiveText3_loc2, ObjectiveText4_loc2, "
- "Title_loc3, Details_loc3, Objectives_loc3, OfferRewardText_loc3, RequestItemsText_loc3, EndText_loc3, CompletedText_loc3, ObjectiveText1_loc3, ObjectiveText2_loc3, ObjectiveText3_loc3, ObjectiveText4_loc3, "
- "Title_loc4, Details_loc4, Objectives_loc4, OfferRewardText_loc4, RequestItemsText_loc4, EndText_loc4, CompletedText_loc4, ObjectiveText1_loc4, ObjectiveText2_loc4, ObjectiveText3_loc4, ObjectiveText4_loc4, "
- "Title_loc5, Details_loc5, Objectives_loc5, OfferRewardText_loc5, RequestItemsText_loc5, EndText_loc5, CompletedText_loc5, ObjectiveText1_loc5, ObjectiveText2_loc5, ObjectiveText3_loc5, ObjectiveText4_loc5, "
- "Title_loc6, Details_loc6, Objectives_loc6, OfferRewardText_loc6, RequestItemsText_loc6, EndText_loc6, CompletedText_loc6, ObjectiveText1_loc6, ObjectiveText2_loc6, ObjectiveText3_loc6, ObjectiveText4_loc6, "
- "Title_loc7, Details_loc7, Objectives_loc7, OfferRewardText_loc7, RequestItemsText_loc7, EndText_loc7, CompletedText_loc7, ObjectiveText1_loc7, ObjectiveText2_loc7, ObjectiveText3_loc7, ObjectiveText4_loc7, "
- "Title_loc8, Details_loc8, Objectives_loc8, OfferRewardText_loc8, RequestItemsText_loc8, EndText_loc8, CompletedText_loc8, ObjectiveText1_loc8, ObjectiveText2_loc8, ObjectiveText3_loc8, ObjectiveText4_loc8"
+ "Title_loc1, Details_loc1, Objectives_loc1, OfferRewardText_loc1, RequestItemsText_loc1, EndText_loc1, CompletedText_loc1, ObjectiveText1_loc1, ObjectiveText2_loc1, ObjectiveText3_loc1, ObjectiveText4_loc1, QuestGiverTextWindow_loc1, QuestGiverTargetName_loc1, QuestTurnTextWindow_loc1, QuestTurnTargetName_loc1"
+ "Title_loc2, Details_loc2, Objectives_loc2, OfferRewardText_loc2, RequestItemsText_loc2, EndText_loc2, CompletedText_loc2, ObjectiveText1_loc2, ObjectiveText2_loc2, ObjectiveText3_loc2, ObjectiveText4_loc2, QuestGiverTextWindow_loc2, QuestGiverTargetName_loc2, QuestTurnTextWindow_loc2, QuestTurnTargetName_loc2"
+ "Title_loc3, Details_loc3, Objectives_loc3, OfferRewardText_loc3, RequestItemsText_loc3, EndText_loc3, CompletedText_loc3, ObjectiveText1_loc3, ObjectiveText2_loc3, ObjectiveText3_loc3, ObjectiveText4_loc3, QuestGiverTextWindow_loc3, QuestGiverTargetName_loc3, QuestTurnTextWindow_loc3, QuestTurnTargetName_loc3"
+ "Title_loc4, Details_loc4, Objectives_loc4, OfferRewardText_loc4, RequestItemsText_loc4, EndText_loc4, CompletedText_loc4, ObjectiveText1_loc4, ObjectiveText2_loc4, ObjectiveText3_loc4, ObjectiveText4_loc4, QuestGiverTextWindow_loc4, QuestGiverTargetName_loc4, QuestTurnTextWindow_loc4, QuestTurnTargetName_loc4"
+ "Title_loc5, Details_loc5, Objectives_loc5, OfferRewardText_loc5, RequestItemsText_loc5, EndText_loc5, CompletedText_loc5, ObjectiveText1_loc5, ObjectiveText2_loc5, ObjectiveText3_loc5, ObjectiveText4_loc5, QuestGiverTextWindow_loc5, QuestGiverTargetName_loc5, QuestTurnTextWindow_loc5, QuestTurnTargetName_loc5"
+ "Title_loc6, Details_loc6, Objectives_loc6, OfferRewardText_loc6, RequestItemsText_loc6, EndText_loc6, CompletedText_loc6, ObjectiveText1_loc6, ObjectiveText2_loc6, ObjectiveText3_loc6, ObjectiveText4_loc6, QuestGiverTextWindow_loc6, QuestGiverTargetName_loc6, QuestTurnTextWindow_loc6, QuestTurnTargetName_loc6"
+ "Title_loc7, Details_loc7, Objectives_loc7, OfferRewardText_loc7, RequestItemsText_loc7, EndText_loc7, CompletedText_loc7, ObjectiveText1_loc7, ObjectiveText2_loc7, ObjectiveText3_loc7, ObjectiveText4_loc7, QuestGiverTextWindow_loc7, QuestGiverTargetName_loc7, QuestTurnTextWindow_loc7, QuestTurnTargetName_loc7"
+ "Title_loc8, Details_loc8, Objectives_loc8, OfferRewardText_loc8, RequestItemsText_loc8, EndText_loc8, CompletedText_loc8, ObjectiveText1_loc8, ObjectiveText2_loc8, ObjectiveText3_loc8, ObjectiveText4_loc8, QuestGiverTextWindow_loc8, QuestGiverTargetName_loc8, QuestTurnTextWindow_loc8, QuestTurnTargetName_loc8"
" FROM locales_quest");
if (!result)
@@ -4456,13 +4456,17 @@ void ObjectMgr::LoadQuestLocales()
{
LocaleConstant locale = (LocaleConstant) i;
- 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) + 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) + 10].GetString(), locale, data.QuestTurnTargetName);
for (uint8 k = 0; k < 4; ++k)
AddLocaleString(fields[1 + 11 * (i - 1) + 7 + k].GetString(), locale, data.ObjectiveText[k]);