araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-20 23:11:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/SAI: CleanUp in 98257b9472 / 2838a62264

Browse Source
This commit is contained in:
Vincent-Michael
2014-10-03 20:05:19 +02:00
parent 64e4b507fa
commit 1d92315492
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+9 -25
View File
@@ -704,29 +704,8 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
{
if (e.GetScriptType() == SMART_SCRIPT_TYPE_CREATURE)
{
uint32 entry = 0;
if (e.entryOrGuid >= 0)
entry = e.entryOrGuid;
else
{
if (CreatureData const* creatureData = sObjectMgr->GetCreatureData(uint32(abs(e.entryOrGuid))))
entry = creatureData->id;
}
CreatureTextMap::const_iterator sList = sCreatureTextMgr->GetTextMap().find(entry);
if (sList == sCreatureTextMgr->GetTextMap().end())
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u could not find Text for Creature %u, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), entry);
if (!IsTextValid(e, e.action.talk.textGroupID))
return false;
}
CreatureTextHolder const& textHolder = sList->second;
CreatureTextHolder::const_iterator itr = textHolder.find(e.action.talk.textGroupID);
if (itr == textHolder.end())
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u could not find TextGroup %u for Creature %u, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), e.action.talk.textGroupID, entry);
return false;
}
}
break;
}
@@ -1170,13 +1149,15 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
return true;
}
/*bool SmartAIMgr::IsTextValid(SmartScriptHolder const& e, uint32 id) // unused
bool SmartAIMgr::IsTextValid(SmartScriptHolder const& e, uint32 id) // unused
{
bool error = false;
uint32 entry = 0;
if (e.entryOrGuid >= 0)
entry = uint32(e.entryOrGuid);
else {
else
{
entry = uint32(abs(e.entryOrGuid));
CreatureData const* data = sObjectMgr->GetCreatureData(entry);
if (!data)
@@ -1187,15 +1168,18 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
else
entry = data->id;
}
if (!entry || !sCreatureTextMgr->TextExist(entry, uint8(id)))
error = true;
if (error)
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u using non-existent Text id %d, skipped.", e.entryOrGuid, e.GetScriptType(), e.source_type, e.GetActionType(), id);
return false;
}
return true;
}*/
}
void SmartAIMgr::LoadHelperStores()
{