diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-07-11 09:23:05 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-07-11 10:29:42 +0200 |
| commit | 17ad3131158024c2da32972eb8f21607b803994a (patch) | |
| tree | 373cd615de3d4d588abdf2647a258b88fe1a8dcc | |
| parent | 52bc6c29358ccfd241b99c8ff7a423f962c5493b (diff) | |
| download | manaserv-17ad3131158024c2da32972eb8f21607b803994a.tar.gz manaserv-17ad3131158024c2da32972eb8f21607b803994a.tar.bz2 manaserv-17ad3131158024c2da32972eb8f21607b803994a.tar.xz manaserv-17ad3131158024c2da32972eb8f21607b803994a.zip | |
Made sure the map is set for trigger scripts
Also unsetted maps after execution of scripts to make finding this mistakes easier.
Reviewed-by: bjorn.
| -rw-r--r-- | src/game-server/trigger.cpp | 1 | ||||
| -rw-r--r-- | src/scripting/luascript.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/game-server/trigger.cpp b/src/game-server/trigger.cpp index dd1392e1..2c007260 100644 --- a/src/game-server/trigger.cpp +++ b/src/game-server/trigger.cpp @@ -50,6 +50,7 @@ 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); diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp index 8ea78f7c..bdff6a12 100644 --- a/src/scripting/luascript.cpp +++ b/src/scripting/luascript.cpp @@ -139,6 +139,7 @@ int LuaScript::execute() } res = lua_tointeger(mCurrentState, -1); lua_pop(mCurrentState, 1); + setMap(0); return res; } |