aboutsummaryrefslogtreecommitdiff
path: root/src/game/ObjectMgr.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-06-01 14:56:54 -0500
committermegamage <none@none>2009-06-01 14:56:54 -0500
commitbe52748f70d9853343aa62fc37fdba51729db895 (patch)
tree0312fe5a05afeb92c60429ae0d4cf57c3eae1514 /src/game/ObjectMgr.cpp
parent89d2c6afda2a8736b68db14445c5eb06c9ea8021 (diff)
[7931] Allow GAMEOBJECT_TYPE_CAMERA gameobjects with event field set call DB scripts. Author: NoFantasy
Drop also redundent check preveting use SCRIPT_COMMAND_CAST_SPELL script command by gameobject script triggred casting. --HG-- branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
-rw-r--r--src/game/ObjectMgr.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 27e1a175de2..c5271429ddd 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -4243,13 +4243,16 @@ void ObjectMgr::LoadEventScripts()
switch(goInfo->type)
{
case GAMEOBJECT_TYPE_GOOBER:
- if(goInfo->goober.eventId)
+ if (goInfo->goober.eventId)
evt_scripts.insert(goInfo->goober.eventId);
break;
case GAMEOBJECT_TYPE_CHEST:
- if(goInfo->chest.eventId)
+ if (goInfo->chest.eventId)
evt_scripts.insert(goInfo->chest.eventId);
break;
+ case GAMEOBJECT_TYPE_CAMERA:
+ if (goInfo->camera.eventID)
+ evt_scripts.insert(goInfo->camera.eventID);
default:
break;
}
@@ -4276,7 +4279,8 @@ void ObjectMgr::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 or type 3 data6 field or any spell effect %u", itr->first, SPELL_EFFECT_SEND_EVENT);
+ 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",
+ itr->first, SPELL_EFFECT_SEND_EVENT);
}
}