aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-11-05 19:08:19 +0100
committerShauren <shauren.trinity@gmail.com>2020-12-08 18:16:46 +0100
commit56c097c12957b9f803b01b85a851aec0ae0761e2 (patch)
treeb3588593cf4177777a75e00759e4d418a60ac148
parentcab4c87d2d7f6d734ef067d6bf50f4b1d338a7bc (diff)
Core/Misc: Remove custom quest levels in title
-rw-r--r--src/server/game/Entities/Creature/GossipDef.cpp18
-rw-r--r--src/server/game/Quests/QuestDef.cpp7
-rw-r--r--src/server/game/Quests/QuestDef.h1
-rw-r--r--src/server/game/World/World.cpp1
-rw-r--r--src/server/game/World/World.h1
-rw-r--r--src/server/worldserver/worldserver.conf.dist8
6 files changed, 0 insertions, 36 deletions
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index d1747b784ba..012cfa85be0 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -229,9 +229,6 @@ void PlayerMenu::SendGossipMenu(uint32 titleTextId, ObjectGuid objectGUID)
++count;
}
- // Store this instead of checking the Singleton every loop iteration
- bool questLevelInTitle = sWorld->getBoolConfig(CONFIG_UI_QUESTLEVELS_IN_DIALOGS);
-
packet.GossipText.resize(_questMenu.GetMenuItemCount());
count = 0;
for (uint8 i = 0; i < _questMenu.GetMenuItemCount(); ++i)
@@ -254,9 +251,6 @@ void PlayerMenu::SendGossipMenu(uint32 titleTextId, ObjectGuid objectGUID)
if (QuestTemplateLocale const* localeData = sObjectMgr->GetQuestLocale(questID))
ObjectMgr::GetLocaleString(localeData->LogTitle, localeConstant, text.QuestTitle);
- if (questLevelInTitle)
- Quest::AddQuestLevelToTitle(text.QuestTitle, quest->GetQuestLevel());
-
++count;
}
}
@@ -363,9 +357,6 @@ void PlayerMenu::SendQuestGiverQuestListMessage(Object* questgiver)
ObjectMgr::GetLocaleString(questGreetingLocale->Greeting, localeConstant, questList.Greeting);
}
- // Store this instead of checking the Singleton every loop iteration
- bool questLevelInTitle = sWorld->getBoolConfig(CONFIG_UI_QUESTLEVELS_IN_DIALOGS);
-
for (uint32 i = 0; i < _questMenu.GetMenuItemCount(); ++i)
{
QuestMenuItem const& questMenuItem = _questMenu.GetItem(i);
@@ -432,9 +423,6 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGU
}
}
- if (sWorld->getBoolConfig(CONFIG_UI_QUESTLEVELS_IN_DIALOGS))
- Quest::AddQuestLevelToTitle(packet.QuestTitle, quest->GetQuestLevel());
-
packet.QuestGiverGUID = npcGUID;
packet.InformUnit = _session->GetPlayer()->GetPlayerSharingQuest();
packet.QuestID = quest->GetQuestId();
@@ -518,9 +506,6 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* quest, ObjectGuid npcGUI
ObjectMgr::GetLocaleString(questOfferRewardLocale->RewardText, locale, packet.RewardText);
}
- if (sWorld->getBoolConfig(CONFIG_UI_QUESTLEVELS_IN_DIALOGS))
- Quest::AddQuestLevelToTitle(packet.QuestTitle, quest->GetQuestLevel());
-
WorldPackets::Quest::QuestGiverOfferReward& offer = packet.QuestData;
quest->BuildQuestRewards(offer.Rewards, _session->GetPlayer());
@@ -575,9 +560,6 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const* quest, ObjectGuid npcGU
ObjectMgr::GetLocaleString(questRequestItemsLocale->CompletionText, locale, packet.CompletionText);
}
- if (sWorld->getBoolConfig(CONFIG_UI_QUESTLEVELS_IN_DIALOGS))
- Quest::AddQuestLevelToTitle(packet.QuestTitle, quest->GetQuestLevel());
-
packet.QuestGiverGUID = npcGUID;
// Is there a better way? what about game objects?
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index 28685dc58ec..b23c1ae1ff1 100644
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -563,10 +563,3 @@ WorldPacket Quest::BuildQueryData(LocaleConstant loc) const
return *response.Write();
}
-
-void Quest::AddQuestLevelToTitle(std::string& title, int32 level)
-{
- // Adds the quest level to the front of the quest title
- // example: [13] Westfall Stew
- title = Trinity::StringFormat("[%d] %s", level, title);
-}
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 4826cebe06d..43bd9e33e9a 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -492,7 +492,6 @@ class TC_GAME_API Quest
void SetEventIdForQuest(uint16 eventId) { _eventIdForQuest = eventId; }
uint16 GetEventIdForQuest() const { return _eventIdForQuest; }
- static void AddQuestLevelToTitle(std::string& title, int32 level);
void InitializeQueryData();
WorldPacket BuildQueryData(LocaleConstant loc) const;
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index f4a1a4fc2aa..21d8258278a 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1518,7 +1518,6 @@ void World::LoadConfigSettings(bool reload)
// misc
m_bool_configs[CONFIG_PDUMP_NO_PATHS] = sConfigMgr->GetBoolDefault("PlayerDump.DisallowPaths", true);
m_bool_configs[CONFIG_PDUMP_NO_OVERWRITE] = sConfigMgr->GetBoolDefault("PlayerDump.DisallowOverwrite", true);
- m_bool_configs[CONFIG_UI_QUESTLEVELS_IN_DIALOGS] = sConfigMgr->GetBoolDefault("UI.ShowQuestLevelsInDialogs", false);
// Wintergrasp battlefield
m_bool_configs[CONFIG_WINTERGRASP_ENABLE] = sConfigMgr->GetBoolDefault("Wintergrasp.Enable", false);
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 1f32f9630fb..5b5551fbacc 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -167,7 +167,6 @@ enum WorldBoolConfigs
CONFIG_ENABLE_MMAPS,
CONFIG_WINTERGRASP_ENABLE,
CONFIG_TOLBARAD_ENABLE,
- CONFIG_UI_QUESTLEVELS_IN_DIALOGS, // Should we add quest levels to the title in the NPC dialogs?
CONFIG_EVENT_ANNOUNCE,
CONFIG_STATS_LIMITS_ENABLE,
CONFIG_INSTANCES_RESET_ANNOUNCE,
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 03c9ddca1d1..e6a500076c7 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -3302,14 +3302,6 @@ PlayerDump.DisallowPaths = 1
PlayerDump.DisallowOverwrite = 1
#
-# UI.ShowQuestLevelsInDialogs
-# Description: Show quest levels next to quest titles in UI dialogs
-# Example: [13] Westfall Stew
-# Default: 0 - (Do not show)
-
-UI.ShowQuestLevelsInDialogs = 0
-
-#
# Calculate.Creature.Zone.Area.Data
# Description: Calculate at loading creature zoneId / areaId and save in creature table (WARNING: SLOW WORLD SERVER STARTUP)
# Default: 0 - (Do not show)