josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/EventAI: Check AIName for EventAI scripts while loading them, avoid iterating again

Browse Source
This commit is contained in:
Subv
2012-06-03 16:27:25 -05:00
parent fa1375b7d6
commit c7cb120449
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+5 -10
View File
@@ -204,13 +204,17 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
temp.raw.param3 = fields[8].GetInt32(); temp.raw.param3 = fields[8].GetInt32();
temp.raw.param4 = fields[9].GetInt32(); temp.raw.param4 = fields[9].GetInt32();
CreatureTemplate* cInfo = sObjectMgr->GetCreatureTemplate(temp.creature_id);
//Creature does not exist in database //Creature does not exist in database
if (!sObjectMgr->GetCreatureTemplate(temp.creature_id)) if (!cInfo)
{ {
sLog->outErrorDb("CreatureEventAI: Event %u has script for non-existing creature entry (%u), skipping.", i, temp.creature_id); sLog->outErrorDb("CreatureEventAI: Event %u has script for non-existing creature entry (%u), skipping.", i, temp.creature_id);
continue; continue;
} }
if (cInfo->AIName != "EventAI")
sLog->outErrorDb("Creature entry %u has EventAI scripts, but its AIName is not 'EventAI' - possible AI-mismatch?", temp.creature_id);
//No chance of this event occuring //No chance of this event occuring
if (temp.event_chance == 0) if (temp.event_chance == 0)
sLog->outErrorDb("CreatureEventAI: Event %u has 0 percent chance. Event will never trigger!", i); sLog->outErrorDb("CreatureEventAI: Event %u has 0 percent chance. Event will never trigger!", i);
@@ -735,15 +739,6 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
} }
while (result->NextRow()); while (result->NextRow());
for (CreatureEventAI_Event_Map::const_iterator itr = m_CreatureEventAI_Event_Map.begin(); itr != m_CreatureEventAI_Event_Map.end(); ++itr)
{
if (CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(itr->first))
{
if (cInfo->AIName != "EventAI")
sLog->outErrorDb("Creature entry %u has EventAI scripts, but its AIName is not 'EventAI' - possible AI-mismatch?", itr->first);
}
}
sLog->outString(">> Loaded %u CreatureEventAI scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); sLog->outString(">> Loaded %u CreatureEventAI scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString(); sLog->outString();
} }