sindoring/moonwell-core-vanilla
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete defines.

Browse Source
This commit is contained in:
ratkosrb
2020-04-30 19:35:39 +03:00
parent 0edcb3709c
commit 618ecbd1d3
64 changed files with 121 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/ScriptMgr.cpp
+5 -5
View File
@@ -1939,7 +1939,7 @@ void ScriptMgr::LoadDatabase()
void ScriptMgr::LoadScriptTexts()
{
sLog.outString("Loading Script Texts...");
LoadMangosStrings(WorldDatabase, "script_texts", TEXT_SOURCE_TEXT_START, TEXT_SOURCE_TEXT_END, true);
sObjectMgr.LoadMangosStrings(WorldDatabase, "script_texts", TEXT_SOURCE_TEXT_START, TEXT_SOURCE_TEXT_END, true);
QueryResult* result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM script_texts WHERE entry BETWEEN %i AND %i", TEXT_SOURCE_TEXT_END, TEXT_SOURCE_TEXT_START);
@@ -2001,7 +2001,7 @@ void ScriptMgr::LoadScriptTexts()
void ScriptMgr::LoadScriptTextsCustom()
{
sLog.outString("Loading Custom Texts...");
LoadMangosStrings(WorldDatabase, "custom_texts", TEXT_SOURCE_CUSTOM_START, TEXT_SOURCE_CUSTOM_END, true);
sObjectMgr.LoadMangosStrings(WorldDatabase, "custom_texts", TEXT_SOURCE_CUSTOM_START, TEXT_SOURCE_CUSTOM_END, true);
QueryResult* result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM custom_texts WHERE entry BETWEEN %i AND %i", TEXT_SOURCE_CUSTOM_END, TEXT_SOURCE_CUSTOM_START);
@@ -2098,7 +2098,7 @@ void ScriptMgr::LoadScriptWaypoints()
pTemp.fZ = pFields[4].GetFloat();
pTemp.uiWaitTime = pFields[5].GetUInt32();
CreatureInfo const* pCInfo = GetCreatureTemplateStore(pTemp.uiCreatureEntry);
CreatureInfo const* pCInfo = sObjectMgr.GetCreatureTemplate(pTemp.uiCreatureEntry);
if (!pCInfo)
{
@@ -2150,7 +2150,7 @@ void ScriptMgr::LoadEscortData()
pTemp.uiQuestEntry = pFields[1].GetUInt32();
pTemp.uiEscortFaction = pFields[2].GetUInt32();
CreatureInfo const* pCInfo = GetCreatureTemplateStore(pTemp.uiCreatureEntry);
CreatureInfo const* pCInfo = sObjectMgr.GetCreatureTemplate(pTemp.uiCreatureEntry);
if (!pCInfo)
{
@@ -2511,7 +2511,7 @@ void DoOrSimulateScriptTextForMap(int32 iTextEntry, uint32 uiCreatureEntry, Map*
return;
}
CreatureInfo const* pInfo = GetCreatureTemplateStore(uiCreatureEntry);
CreatureInfo const* pInfo = sObjectMgr.GetCreatureTemplate(uiCreatureEntry);
if (!pInfo)
{
sLog.outError("DoOrSimulateScriptTextForMap has invalid source entry %u for map %u.", uiCreatureEntry, pMap->GetId());