diff options
Diffstat (limited to 'src/game-server/trigger.cpp')
| -rw-r--r-- | src/game-server/trigger.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/game-server/trigger.cpp b/src/game-server/trigger.cpp index 027754d5..a648df49 100644 --- a/src/game-server/trigger.cpp +++ b/src/game-server/trigger.cpp @@ -23,12 +23,12 @@ #include "game-server/character.hpp" #include "game-server/mapcomposite.hpp" -#include "game-server/movingobject.hpp" +#include "game-server/actor.hpp" #include "game-server/state.hpp" #include "utils/logger.h" -void WarpAction::process(Object *obj) +void WarpAction::process(Actor *obj) { if (obj->getType() == OBJECT_CHARACTER) { @@ -36,11 +36,12 @@ void WarpAction::process(Object *obj) } } -void ScriptAction::process(Object *obj) +void ScriptAction::process(Actor *obj) { - LOG_DEBUG("Script trigger area activated: "<<mFunction<<"("<<obj<<", "<<mArg<<")"); - if (!mScript) return; - if (mFunction == "") return; + LOG_DEBUG("Script trigger area activated: " << mFunction + << "(" << obj << ", " << mArg << ")"); + if (!mScript || mFunction.empty()) + return; mScript->prepare(mFunction); mScript->push(obj); mScript->push(mArg); @@ -49,8 +50,8 @@ void ScriptAction::process(Object *obj) void TriggerArea::update() { - std::set<Object*> insideNow; - for (MovingObjectIterator i(getMap()->getInsideRectangleIterator(mZone)); i; ++i) + std::set<Actor*> insideNow; + for (BeingIterator i(getMap()->getInsideRectangleIterator(mZone)); i; ++i) { if (mZone.contains((*i)->getPosition())) //<-- Why is this additional condition necessary? Shouldn't getInsideRectangleIterator already exclude those outside of the zone? --Crush { |