mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11296] Load and check GAMEOBJECT_TYPE_CAPTURE_POINT event id's

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2011-03-28 09:24:42 +02:00
parent 2aef552668
commit d79d348af1
2 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/game/ScriptMgr.cpp
View file

@ -606,10 +606,26 @@ void ScriptMgr::LoadEventScripts()
// Load all possible script entries from gameobjects
for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i)
{
if (GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(i))
{
if (uint32 eventId = goInfo->GetEventScriptId())
evt_scripts.insert(eventId);
if (goInfo->type == GAMEOBJECT_TYPE_CAPTURE_POINT)
{
evt_scripts.insert(goInfo->capturePoint.neutralEventID1);
evt_scripts.insert(goInfo->capturePoint.neutralEventID2);
evt_scripts.insert(goInfo->capturePoint.contestedEventID1);
evt_scripts.insert(goInfo->capturePoint.contestedEventID2);
evt_scripts.insert(goInfo->capturePoint.progressEventID1);
evt_scripts.insert(goInfo->capturePoint.progressEventID2);
evt_scripts.insert(goInfo->capturePoint.winEventID1);
evt_scripts.insert(goInfo->capturePoint.winEventID2);
}
}
}
// Load all possible script entries from spells
for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
{
@ -646,7 +662,7 @@ void ScriptMgr::LoadEventScripts()
{
std::set<uint32>::const_iterator itr2 = evt_scripts.find(itr->first);
if (itr2 == evt_scripts.end())
sLog.outErrorDb("Table `event_scripts` has script (Id: %u) not referring to any gameobject_template type 10 data2 field, type 3 data6 field, type 13 data 2 field or any spell effect %u or path taxi node data",
sLog.outErrorDb("Table `event_scripts` has script (Id: %u) not referring to any gameobject_template type 10 data2 field, type 3 data6 field, type 13 data 2 field, type 29 or any spell effect %u or path taxi node data",
itr->first, SPELL_EFFECT_SEND_EVENT);
}
}
@ -778,10 +794,26 @@ void ScriptMgr::LoadEventIdScripts()
// Load all possible event entries from gameobjects
for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i)
{
if (GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(i))
{
if (uint32 eventId = goInfo->GetEventScriptId())
evt_scripts.insert(eventId);
if (goInfo->type == GAMEOBJECT_TYPE_CAPTURE_POINT)
{
evt_scripts.insert(goInfo->capturePoint.neutralEventID1);
evt_scripts.insert(goInfo->capturePoint.neutralEventID2);
evt_scripts.insert(goInfo->capturePoint.contestedEventID1);
evt_scripts.insert(goInfo->capturePoint.contestedEventID2);
evt_scripts.insert(goInfo->capturePoint.progressEventID1);
evt_scripts.insert(goInfo->capturePoint.progressEventID2);
evt_scripts.insert(goInfo->capturePoint.winEventID1);
evt_scripts.insert(goInfo->capturePoint.winEventID2);
}
}
}
// Load all possible event entries from spells
for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
{
@ -826,7 +858,7 @@ void ScriptMgr::LoadEventIdScripts()
std::set<uint32>::const_iterator itr = evt_scripts.find(eventId);
if (itr == evt_scripts.end())
sLog.outErrorDb("Table `scripted_event_id` has id %u not referring to any gameobject_template type 10 data2 field, type 3 data6 field, type 13 data 2 field or any spell effect %u or path taxi node data",
sLog.outErrorDb("Table `scripted_event_id` has id %u not referring to any gameobject_template type 10 data2 field, type 3 data6 field, type 13 data 2 field, type 29 or any spell effect %u or path taxi node data",
eventId, SPELL_EFFECT_SEND_EVENT);
m_EventIdScripts[eventId] = GetScriptId(scriptName);