mirror of
https://github.com/love2d/love.git
synced 2026-08-18 11:44:15 +02:00
Restore lua 5.2/5.3 compatibility (fixes #1408)
This commit is contained in:
@@ -879,4 +879,13 @@ Type *luax_type(lua_State *L, int idx)
|
||||
return Type::byName(luaL_checkstring(L, idx));
|
||||
}
|
||||
|
||||
int luax_resume(lua_State *L, int nargs)
|
||||
{
|
||||
#if LUA_VERSION_NUM >= 502
|
||||
return lua_resume(L, nullptr, nargs);
|
||||
#else
|
||||
return lua_resume(L, nargs);
|
||||
#endif
|
||||
}
|
||||
|
||||
} // love
|
||||
|
||||
@@ -676,6 +676,11 @@ int luax_catchexcept(lua_State *L, const T& func, const F& finallyfunc)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compatibility shim for lua_resume
|
||||
**/
|
||||
int luax_resume(lua_State *L, int nargs);
|
||||
|
||||
} // love
|
||||
|
||||
#endif // LOVE_RUNTIME_H
|
||||
|
||||
+2
-1
@@ -19,6 +19,7 @@
|
||||
**/
|
||||
|
||||
#include "common/version.h"
|
||||
#include "common/runtime.h"
|
||||
#include "modules/love/love.h"
|
||||
#include <SDL.h>
|
||||
|
||||
@@ -214,7 +215,7 @@ static DoneAction runlove(int argc, char **argv, int &retval)
|
||||
lua_newthread(L);
|
||||
lua_pushvalue(L, -2);
|
||||
int stackpos = lua_gettop(L);
|
||||
while (lua_resume(L, 0) == LUA_YIELD)
|
||||
while (love::luax_resume(L, 0) == LUA_YIELD)
|
||||
lua_pop(L, lua_gettop(L) - stackpos);
|
||||
|
||||
retval = 0;
|
||||
|
||||
Reference in New Issue
Block a user