From 8f37314950473b237e707e55be73e980d6fe6c00 Mon Sep 17 00:00:00 2001 From: zergtmn Date: Fri, 24 Dec 2010 00:45:56 +0500 Subject: [PATCH] [10913] Fix db_script_string loading --- src/game/ScriptMgr.cpp | 18 +++++++++--------- src/shared/revision_nr.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp index 7790a571e..d4ba764ae 100644 --- a/src/game/ScriptMgr.cpp +++ b/src/game/ScriptMgr.cpp @@ -632,7 +632,7 @@ void ScriptMgr::LoadCreatureMovementScripts() void ScriptMgr::LoadDbScriptStrings() { - LoadMangosStrings(WorldDatabase,"db_script_string",MIN_DB_SCRIPT_STRING_ID,MAX_DB_SCRIPT_STRING_ID); + sObjectMgr.LoadMangosStrings(WorldDatabase, "db_script_string", MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID); std::set ids; @@ -640,18 +640,18 @@ void ScriptMgr::LoadDbScriptStrings() if (sObjectMgr.GetMangosStringLocale(i)) ids.insert(i); - CheckScriptTexts(sQuestEndScripts,ids); - CheckScriptTexts(sQuestStartScripts,ids); - CheckScriptTexts(sSpellScripts,ids); - CheckScriptTexts(sGameObjectScripts,ids); - CheckScriptTexts(sEventScripts,ids); - CheckScriptTexts(sGossipScripts,ids); - CheckScriptTexts(sCreatureMovementScripts,ids); + CheckScriptTexts(sQuestEndScripts, ids); + CheckScriptTexts(sQuestStartScripts, ids); + CheckScriptTexts(sSpellScripts, ids); + CheckScriptTexts(sGameObjectScripts, ids); + CheckScriptTexts(sEventScripts, ids); + CheckScriptTexts(sGossipScripts, ids); + CheckScriptTexts(sCreatureMovementScripts, ids); sWaypointMgr.CheckTextsExistance(ids); for(std::set::const_iterator itr = ids.begin(); itr != ids.end(); ++itr) - sLog.outErrorDb( "Table `db_script_string` has unused string id %u", *itr); + sLog.outErrorDb("Table `db_script_string` has unused string id %u", *itr); } void ScriptMgr::CheckScriptTexts(ScriptMapMap const& scripts, std::set& ids) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c0a3f2701..5cabf6793 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10912" + #define REVISION_NR "10913" #endif // __REVISION_NR_H__