mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[7674] Fixed check of DB script string ids from db_script_string at loading.
This commit is contained in:
parent
3e4b31debb
commit
748ea8522a
2 changed files with 9 additions and 6 deletions
|
|
@ -7398,16 +7398,19 @@ 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)
|
||||||
|
{
|
||||||
|
case SCRIPT_COMMAND_TALK:
|
||||||
{
|
{
|
||||||
if(!GetMangosStringLocale (itrM->second.dataint))
|
if(!GetMangosStringLocale (itrM->second.dataint))
|
||||||
sLog.outErrorDb( "Table `db_script_string` has not existed string id %u", itrM->first);
|
sLog.outErrorDb( "Table `db_script_string` not has string id %u used db script (ID: %s)", 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObjectMgr::LoadDbScriptStrings()
|
void ObjectMgr::LoadDbScriptStrings()
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7673"
|
#define REVISION_NR "7674"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue