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

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

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

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
NoFantasy 2009-06-01 02:17:17 +04:00 • committed by VladimirMangos
parent bc953feb31
commit c386bef32e
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/ObjectMgr.cpp
View file

@ -3928,13 +3928,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;
} }
@ -3961,7 +3964,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);
} }
} }

6
src/game/World.cpp
View file

@ -2201,12 +2201,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)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7930" #define REVISION_NR "7931"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__