From 01aeccb8d748e0882f8350b3c01298fdc09afdc8 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 30 Jan 2012 12:41:05 +0100 Subject: [PATCH] Core/ObjectMgr: Improved error message to include source of the error SQL: Renamed files to match standards --- ...3_03_gossip_menu.sql => 2012_01_13_03_world_gossip_menu.sql} | 0 ...s.sql => 2012_01_27_00_world_player_factionchange_items.sql} | 0 src/server/game/Globals/ObjectMgr.cpp | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename sql/updates/world/{2012_01_13_03_gossip_menu.sql => 2012_01_13_03_world_gossip_menu.sql} (100%) rename sql/updates/world/{2012_01_27_00_player_factionchange_items.sql => 2012_01_27_00_world_player_factionchange_items.sql} (100%) diff --git a/sql/updates/world/2012_01_13_03_gossip_menu.sql b/sql/updates/world/2012_01_13_03_world_gossip_menu.sql similarity index 100% rename from sql/updates/world/2012_01_13_03_gossip_menu.sql rename to sql/updates/world/2012_01_13_03_world_gossip_menu.sql diff --git a/sql/updates/world/2012_01_27_00_player_factionchange_items.sql b/sql/updates/world/2012_01_27_00_world_player_factionchange_items.sql similarity index 100% rename from sql/updates/world/2012_01_27_00_player_factionchange_items.sql rename to sql/updates/world/2012_01_27_00_world_player_factionchange_items.sql diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 086dd610ee2..dc78489070e 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8683,7 +8683,7 @@ void ObjectMgr::CheckScripts(ScriptsType type, std::set& ids) case SCRIPT_COMMAND_TALK: { if (!GetTrinityStringLocale (itrM->second.Talk.TextID)) - sLog->outErrorDb("Table `db_script_string` not has string id %u used db script (ID: %u)", itrM->second.Talk.TextID, itrMM->first); + sLog->outErrorDb("Table `%s` references invalid text id %u from `db_script_string`, script id: %u.", GetScriptsTableNameByType(type).c_str(), itrM->second.Talk.TextID, itrMM->first); if (ids.find(itrM->second.Talk.TextID) != ids.end()) ids.erase(itrM->second.Talk.TextID);