thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-03-26 21:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

explicitly allow setting cobjects to nil

Browse source
This commit is contained in:
Isaac0-dev 2025-03-14 10:24:33 +10:00
parent 83c967457f
commit 2dd17af4e1
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pc/lua/smlua_cobject.c
View file

@ -430,6 +430,10 @@ static bool smlua_set_field(lua_State* L, u8* p, struct LuaObjectField *data) {
case LVT_U64: *(s64*)p = smlua_to_integer(L, 3); break;
case LVT_COBJECT_P:
if (lua_isnil(L, 3)) {
*(u8**)p = NULL;
break;
}
valuePointer = smlua_to_cobject(L, 3, data->lot);
if (gSmLuaConvertSuccess) {
*(u8**)p = valuePointer;
@ -450,6 +454,10 @@ static bool smlua_set_field(lua_State* L, u8* p, struct LuaObjectField *data) {
case LVT_OBJECTANIMPOINTER_P:
case LVT_COLLISION_P:
case LVT_TRAJECTORY_P:
if (lua_isnil(L, 3)) {
*(u8**)p = NULL;
break;
}
valuePointer = smlua_to_cpointer(L, 3, data->valueType);
if (gSmLuaConvertSuccess) {
*(u8**)p = valuePointer;

4
src/pc/lua/smlua_utils.c
View file

@ -153,7 +153,7 @@ void* smlua_to_cobject(lua_State* L, int index, u16 lot) {
if (indexType != LUA_TUSERDATA) {
LOG_LUA_LINE("smlua_to_cobject received improper type '%s'", lua_typename(L, indexType));
gSmLuaConvertSuccess = false;
return 0;
return NULL;
}
CObject *cobject = luaL_checkudata(L, index, "CObject");
@ -179,7 +179,7 @@ void* smlua_to_cpointer(lua_State* L, int index, u16 lvt) {
if (indexType != LUA_TUSERDATA) {
LOG_LUA_LINE("smlua_to_cpointer received improper type '%s'", lua_typename(L, indexType));
gSmLuaConvertSuccess = false;
return 0;
return NULL;
}
CPointer *cpointer = luaL_checkudata(L, index, "CPointer");