matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary lua_pushlightuserdata usage, use commandInterface global instead

Browse Source 
This causes a crash when using luajit on aarch64 Android builds. I didn't remove the lua_pushlightuserdata usage in LuaLuna.h because that's external code and beyond my understanding
This commit is contained in:
jacob1 2023-10-24 22:12:11 -04:00
parent 7d337ab732
commit d5681d8ed9
No known key found for this signature in database
GPG Key ID: 4E58A32D510E1995
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lua/LuaComponent.cpp
View File

@ -18,10 +18,7 @@ LuaComponent::LuaComponent(lua_State * l) : component(nullptr), owner_ref(LUA_RE
{ {
this->l = l; // I don't get how this doesn't cause crashes later on this->l = l; // I don't get how this doesn't cause crashes later on
lua_pushliteral(l, "Luacon_ci"); ci = static_cast<LuaScriptInterface *>(commandInterface);
lua_gettable(l, LUA_REGISTRYINDEX);
ci = (LuaScriptInterface*)lua_touserdata(l, -1);
lua_pop(l, 1);
} }
int LuaComponent::position(lua_State * l) int LuaComponent::position(lua_State * l)

4
src/lua/LuaScriptInterface.cpp
View File

@ -297,10 +297,6 @@ LuaScriptInterface::LuaScriptInterface(GameController * c, GameModel * m):
luaopen_bit(l); luaopen_bit(l);
lua_pop(l, 1); lua_pop(l, 1);
lua_pushliteral(l, "Luacon_ci");
lua_pushlightuserdata(l, this);
lua_settable(l, LUA_REGISTRYINDEX);
initSimulationAPI(); initSimulationAPI();
initInterfaceAPI(); initInterfaceAPI();
SetWindow(c->GetView()); SetWindow(c->GetView());

5
src/lua/LuaWindow.cpp
View File

@ -53,10 +53,7 @@ LuaWindow::LuaWindow(lua_State * l)
if (sizeY < 10) if (sizeY < 10)
sizeY = 10; sizeY = 10;
lua_pushliteral(l, "Luacon_ci"); ci = static_cast<LuaScriptInterface *>(commandInterface);
lua_gettable(l, LUA_REGISTRYINDEX);
ci = (LuaScriptInterface*)lua_touserdata(l, -1);
lua_pop(l, 1);
class DrawnWindow : public ui::Window class DrawnWindow : public ui::Window
{ {