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

[7931] Allow GAMEOBJECT_TYPE_CAMERA gameobjects with event field set call DB scripts. Author: NoFantasy

Browse Source 
Drop also redundent check preveting use SCRIPT_COMMAND_CAST_SPELL script command by gameobject script triggred casting.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-01 14:56:54 -05:00
parent 89d2c6afda
commit be52748f70
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/ObjectMgr.cpp
+7 -3
View File
@@ -4243,13 +4243,16 @@ void ObjectMgr::LoadEventScripts()
switch(goInfo->type) switch(goInfo->type)
{ {
case GAMEOBJECT_TYPE_GOOBER: case GAMEOBJECT_TYPE_GOOBER:
if(goInfo->goober.eventId) if (goInfo->goober.eventId)
evt_scripts.insert(goInfo->goober.eventId); evt_scripts.insert(goInfo->goober.eventId);
break; break;
case GAMEOBJECT_TYPE_CHEST: case GAMEOBJECT_TYPE_CHEST:
if(goInfo->chest.eventId) if (goInfo->chest.eventId)
evt_scripts.insert(goInfo->chest.eventId); evt_scripts.insert(goInfo->chest.eventId);
break; break;
case GAMEOBJECT_TYPE_CAMERA:
if (goInfo->camera.eventID)
evt_scripts.insert(goInfo->camera.eventID);
default: default:
break; break;
} }
@@ -4276,7 +4279,8 @@ void ObjectMgr::LoadEventScripts()
{ {
std::set<uint32>::const_iterator itr2 = evt_scripts.find(itr->first); std::set<uint32>::const_iterator itr2 = evt_scripts.find(itr->first);
if (itr2 == evt_scripts.end()) 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);
} }
} }
src/game/World.cpp
-6
View File
@@ -2434,12 +2434,6 @@ void World::ScriptsProcess()
break; 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; Object* cmdTarget = step.script->datalong2 & 0x01 ? source : target;
if(!cmdTarget) if(!cmdTarget)