ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdl: applied patch to use system lua on non-win platforms (thanks Joe Nahmias!)

This commit is contained in:
punkrockguy318 2013-07-08 23:00:57 +00:00
parent 3c27962337
commit 97295e18c4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trunk/src/lua-engine.cpp
View File

@ -85,8 +85,8 @@ extern "C"
#include <lua.h> #include <lua.h>
#include <lauxlib.h> #include <lauxlib.h>
#include <lualib.h> #include <lualib.h>
#include <lstate.h>
#ifdef WIN32 #ifdef WIN32
#include <lstate.h>
int iuplua_open(lua_State * L); int iuplua_open(lua_State * L);
int iupcontrolslua_open(lua_State * L); int iupcontrolslua_open(lua_State * L);
int luaopen_winapi(lua_State * L); int luaopen_winapi(lua_State * L);
@ -1189,6 +1189,7 @@ void CallRegisteredLuaLoadFunctions(int savestateNumber, const LuaSaveData& save
if (lua_isfunction(L, -1)) if (lua_isfunction(L, -1))
{ {
#ifdef WIN32
// since the scriptdata can be very expensive to load // since the scriptdata can be very expensive to load
// (e.g. the registered save function returned some huge tables) // (e.g. the registered save function returned some huge tables)
// check the number of parameters the registered load function expects // check the number of parameters the registered load function expects
@ -1200,6 +1201,13 @@ void CallRegisteredLuaLoadFunctions(int savestateNumber, const LuaSaveData& save
lua_pushinteger(L, savestateNumber); lua_pushinteger(L, savestateNumber);
saveData.LoadRecord(L, LUA_DATARECORDKEY, numParamsExpected); saveData.LoadRecord(L, LUA_DATARECORDKEY, numParamsExpected);
#else
int prevGarbage = lua_gc(L, LUA_GCCOUNT, 0);
lua_pushinteger(L, savestateNumber);
saveData.LoadRecord(L, LUA_DATARECORDKEY, (unsigned int) -1);
#endif
int n = lua_gettop(L) - 1; int n = lua_gettop(L) - 1;
int ret = lua_pcall(L, n, 0, 0); int ret = lua_pcall(L, n, 0, 0);