diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-21 07:29:58 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-21 07:29:58 +0100 |
| commit | f93b4c25242370982715e1a83c11e667b17f20af (patch) | |
| tree | 07b392040bd858e205d12cf8f0977cf82fcc2c90 /src/game-server/trigger.cpp | |
| parent | bcb3f283bda155bec33c83c4627f59acb4616dd8 (diff) | |
| parent | 4559ca444daacfd02ebb05f1657148a2b4cf3d8b (diff) | |
| download | manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.gz manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.bz2 manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.xz manaserv-f93b4c25242370982715e1a83c11e667b17f20af.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/game-server/trigger.cpp')
| -rw-r--r-- | src/game-server/trigger.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game-server/trigger.cpp b/src/game-server/trigger.cpp index 2c007260..10e50ecb 100644 --- a/src/game-server/trigger.cpp +++ b/src/game-server/trigger.cpp @@ -50,11 +50,10 @@ void ScriptAction::process(Actor *obj) LOG_DEBUG("Script trigger area activated: " << "(" << obj << ", " << mArg << ")"); - mScript->setMap(obj->getMap()); mScript->prepare(mCallback); mScript->push(obj); mScript->push(mArg); - mScript->execute(); + mScript->execute(obj->getMap()); } void TriggerArea::update() |