[7674] Fixed check of DB script string ids from db_script_string at loading. Author: VladimirMangos
--HG-- branch : trunk
This commit is contained in:
@@ -7755,13 +7755,16 @@ void ObjectMgr::CheckScripts(ScriptMapMap const& scripts,std::set<int32>& ids)
|
|||||||
{
|
{
|
||||||
for(ScriptMap::const_iterator itrM = itrMM->second.begin(); itrM != itrMM->second.end(); ++itrM)
|
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))
|
case SCRIPT_COMMAND_TALK:
|
||||||
sLog.outErrorDb( "Table `db_script_string` has not existed string id %u", itrM->first);
|
{
|
||||||
|
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))
|
if(ids.count(itrM->second.dataint))
|
||||||
ids.erase(itrM->second.dataint);
|
ids.erase(itrM->second.dataint);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user