summaryrefslogtreecommitdiff
path: root/src/scripting/luautil.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-02-21 07:29:58 +0100
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-02-21 07:29:58 +0100
commitf93b4c25242370982715e1a83c11e667b17f20af (patch)
tree07b392040bd858e205d12cf8f0977cf82fcc2c90 /src/scripting/luautil.cpp
parentbcb3f283bda155bec33c83c4627f59acb4616dd8 (diff)
parent4559ca444daacfd02ebb05f1657148a2b4cf3d8b (diff)
downloadmanaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.gz
manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.bz2
manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.xz
manaserv-f93b4c25242370982715e1a83c11e667b17f20af.zip
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/scripting/luautil.cpp')
-rw-r--r--src/scripting/luautil.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp
index f7b39e29..6210eda0 100644
--- a/src/scripting/luautil.cpp
+++ b/src/scripting/luautil.cpp
@@ -267,7 +267,7 @@ MapComposite *checkCurrentMap(lua_State *s, Script *script /* = 0 */)
if (!script)
script = getScript(s);
- MapComposite *mapComposite = script->getMap();
+ MapComposite *mapComposite = script->getContext()->map;
if (!mapComposite)
luaL_error(s, "no current map");