diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/ObjectMgr.cpp | 10 | ||||
| -rw-r--r-- | src/game/World.cpp | 6 |
2 files changed, 7 insertions, 9 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); } } diff --git a/src/game/World.cpp b/src/game/World.cpp index e180e38b4db..cf14b846508 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -2434,12 +2434,6 @@ void World::ScriptsProcess() break; } - if(!source->isType(TYPEMASK_UNIT)) - { - sLog.outError("SCRIPT_COMMAND_CAST_SPELL source caster isn't unit (TypeId: %u), skipping.",source->GetTypeId()); - break; - } - Object* cmdTarget = step.script->datalong2 & 0x01 ? source : target; if(!cmdTarget) |