From 520705579d6a68cf6908275026eef2edee0758af Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Sat, 10 Mar 2012 23:31:32 +0100
Subject: Added callbacks for map/worldvar changes

Reviewed-by: bjorn.
---
 src/scripting/luascript.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/scripting/luascript.cpp')

diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp
index dfa64d0..e45588b 100644
--- a/src/scripting/luascript.cpp
+++ b/src/scripting/luascript.cpp
@@ -118,10 +118,11 @@ void LuaScript::push(const std::list<InventoryItem> &itemList)
 int LuaScript::execute()
 {
     assert(nbArgs >= 0);
-    assert(!mCurrentThread);
 
-    int res = lua_pcall(mCurrentState, nbArgs, 1, 1);
+
+    const int tmpNbArgs = nbArgs;
     nbArgs = -1;
+    int res = lua_pcall(mCurrentState, tmpNbArgs, 1, 1);
 
     if (res || !(lua_isnil(mCurrentState, -1) || lua_isnumber(mCurrentState, -1)))
     {
@@ -144,8 +145,9 @@ bool LuaScript::resume()
     assert(mCurrentThread);
 
     setMap(mCurrentThread->mMap);
-    int result = lua_resume(mCurrentState, nbArgs);
+    const int tmpNbArgs = nbArgs;
     nbArgs = -1;
+    int result = lua_resume(mCurrentState, tmpNbArgs);
     setMap(0);
 
     if (result == 0)                // Thread is done
-- 
cgit