diff options
author | Shauren <shauren.trinity@gmail.com> | 2012-01-30 12:41:05 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2012-01-30 12:41:05 +0100 |
commit | 01aeccb8d748e0882f8350b3c01298fdc09afdc8 (patch) | |
tree | f49d41f7a6ec7160fbacf157197a0b06972d08a3 | |
parent | 83e0486e59ddf17ef8abc83b57ff459f8b9e1e9c (diff) |
Core/ObjectMgr: Improved error message to include source of the error
SQL: Renamed files to match standards
-rw-r--r-- | sql/updates/world/2012_01_13_03_world_gossip_menu.sql (renamed from sql/updates/world/2012_01_13_03_gossip_menu.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/2012_01_27_00_world_player_factionchange_items.sql (renamed from sql/updates/world/2012_01_27_00_player_factionchange_items.sql) | 0 | ||||
-rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 2 |
3 files changed, 1 insertions, 1 deletions
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 index 98dda69bf1a..98dda69bf1a 100644 --- a/sql/updates/world/2012_01_13_03_gossip_menu.sql +++ b/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 index 1dc2749807e..1dc2749807e 100644 --- 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 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<int32>& 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); |