From 1a19f1864000b3033261979179276a37ee933731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 19 Aug 2013 16:19:42 +0200
Subject: [PATCH] port to Lua 5.2
---
acinclude.m4 | 4 ++--
src/mm3dcore/luascript.cc | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index e7426d1..b79829f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -234,7 +234,7 @@ EOF
int main( int argc, char **argv )
{
- lua_State * L = lua_open();
+ lua_State * L = luaL_newstate();
//luaopen_math( L );
lua_close( L );
return( 0 );
@@ -403,7 +403,7 @@ EOF
int main( int argc, char **argv )
{
- lua_State * L = lua_open();
+ lua_State * L = luaL_newstate();
luaopen_math( L );
lua_close( L );
return( 0 );
diff --git a/src/mm3dcore/luascript.cc b/src/mm3dcore/luascript.cc
index 3b431ea..2889b2e 100644
--- a/src/mm3dcore/luascript.cc
+++ b/src/mm3dcore/luascript.cc
@@ -90,7 +90,7 @@ static const char * _luascript_readchunk( lua_State * L, void * data, size_t * s
LuaScript::LuaScript()
{
- m_luaState = lua_open();
+ m_luaState = luaL_newstate();
luaopen_math( m_luaState );
}
@@ -110,7 +110,7 @@ int LuaScript::runFile( const char * filename )
ReadChunkDataT rcd;
rcd.src = NULL;
rcd.filename = filename;
- rval = lua_load( m_luaState, _luascript_readchunk, (void *) &rcd, filename );
+ rval = lua_load( m_luaState, _luascript_readchunk, (void *) &rcd, filename, NULL );
if ( rval == 0 )
{
@@ -167,7 +167,7 @@ void LuaScript::registerClosure( void * ptr, const char * name, lua_CFunction fu
lua_pushstring( m_luaState, name );
lua_pushlightuserdata( m_luaState, ptr );
lua_pushcclosure( m_luaState, func, 1 );
- lua_settable( m_luaState, LUA_GLOBALSINDEX );
+ lua_setglobal( m_luaState, name );
}
/*
--
2.17.2