From 9af93fa834cf1adafd5a1176e61a9875f69a14b8 Mon Sep 17 00:00:00 2001 From: megamage Date: Fri, 17 Apr 2009 15:16:19 -0500 Subject: [7674] Fixed check of DB script string ids from `db_script_string` at loading. Author: VladimirMangos --HG-- branch : trunk --- src/game/ObjectMgr.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index b9b7c0a489d..d3a9fe23395 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -7755,13 +7755,16 @@ void ObjectMgr::CheckScripts(ScriptMapMap const& scripts,std::set& ids) { for(ScriptMap::const_iterator itrM = itrMM->second.begin(); itrM != itrMM->second.end(); ++itrM) { - if(itrM->second.dataint) + switch(itrM->second.command) { - if(!GetTrinityStringLocale (itrM->second.dataint)) - sLog.outErrorDb( "Table `db_script_string` has not existed string id %u", itrM->first); + case SCRIPT_COMMAND_TALK: + { + if(!GetTrinityStringLocale (itrM->second.dataint)) + sLog.outErrorDb( "Table `db_script_string` not has string id %u used db script (ID: %u)", itrM->second.dataint, itrMM->first); - if(ids.count(itrM->second.dataint)) - ids.erase(itrM->second.dataint); + if(ids.count(itrM->second.dataint)) + ids.erase(itrM->second.dataint); + } } } } -- cgit v1.2.3