From 2b3aeabfa90a12a478e1d2b3154aaeb4aaf84df3 Mon Sep 17 00:00:00 2001 From: Cooliokid956 <68075390+Cooliokid956@users.noreply.github.com> Date: Fri, 27 Mar 2026 21:31:55 -0500 Subject: [PATCH] revert unrelated change --- autogen/lua_definitions/functions.lua | 1 - docs/lua/functions-6.md | 6 +++--- src/pc/lua/smlua_functions_autogen.c | 2 +- src/pc/lua/utils/smlua_collision_utils.c | 6 ++---- src/pc/lua/utils/smlua_collision_utils.h | 3 +-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/autogen/lua_definitions/functions.lua b/autogen/lua_definitions/functions.lua index 651ea6525..e3424b38c 100644 --- a/autogen/lua_definitions/functions.lua +++ b/autogen/lua_definitions/functions.lua @@ -10709,7 +10709,6 @@ function smlua_collision_util_get_level_collision(level, area) end --- @param data Pointer_Collision ---- @return table --- Gets a table of the surface types from `data` function smlua_collision_util_find_surface_types(data) -- ... diff --git a/docs/lua/functions-6.md b/docs/lua/functions-6.md index 3572776d2..eda1d0825 100644 --- a/docs/lua/functions-6.md +++ b/docs/lua/functions-6.md @@ -7406,7 +7406,7 @@ Gets the `level` terrain collision from `area` Gets a table of the surface types from `data` ### Lua Example -`local tableValue = smlua_collision_util_find_surface_types(data)` +`smlua_collision_util_find_surface_types(data)` ### Parameters | Field | Type | @@ -7414,10 +7414,10 @@ Gets a table of the surface types from `data` | data | `Pointer` <`Collision`> | ### Returns -- `table` +- None ### C Prototype -`LuaTable smlua_collision_util_find_surface_types(Collision* data);` +`void smlua_collision_util_find_surface_types(Collision* data);` [:arrow_up_small:](#) diff --git a/src/pc/lua/smlua_functions_autogen.c b/src/pc/lua/smlua_functions_autogen.c index 7c9c88269..130b733e9 100644 --- a/src/pc/lua/smlua_functions_autogen.c +++ b/src/pc/lua/smlua_functions_autogen.c @@ -31768,7 +31768,7 @@ int smlua_func_smlua_collision_util_find_surface_types(lua_State* L) { Collision* data = (Collision*)smlua_to_cpointer(L, 1, LVT_COLLISION_P); if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "smlua_collision_util_find_surface_types"); return 0; } - smlua_push_lua_table(L, smlua_collision_util_find_surface_types(data)); + smlua_collision_util_find_surface_types(data); return 1; } diff --git a/src/pc/lua/utils/smlua_collision_utils.c b/src/pc/lua/utils/smlua_collision_utils.c index 59771ca6e..0a83bc172 100644 --- a/src/pc/lua/utils/smlua_collision_utils.c +++ b/src/pc/lua/utils/smlua_collision_utils.c @@ -209,9 +209,8 @@ Collision *smlua_collision_util_get_level_collision(u32 level, u16 area) { return dynos_level_get_collision(level, area); } -LuaTable smlua_collision_util_find_surface_types(Collision* data) { +void smlua_collision_util_find_surface_types(Collision* data) { lua_State* L = gLuaState; - if (!L) { return 0; } if (data && *data++ == COL_INIT()) { lua_newtable(L); @@ -232,12 +231,11 @@ LuaTable smlua_collision_util_find_surface_types(Collision* data) { lua_pushinteger(L, surfaceType); lua_settable(L, t); } - return smlua_to_lua_table(L, -1); + return; } // Couldn't find anything lua_pushnil(L); - return 0; } bool surface_is_quicksand(struct Surface* surf) { diff --git a/src/pc/lua/utils/smlua_collision_utils.h b/src/pc/lua/utils/smlua_collision_utils.h index 0c4bb1652..8836a7162 100644 --- a/src/pc/lua/utils/smlua_collision_utils.h +++ b/src/pc/lua/utils/smlua_collision_utils.h @@ -1,7 +1,6 @@ #ifndef SMLUA_COLLISION_UTILS_H #define SMLUA_COLLISION_UTILS_H -#include "pc/lua/smlua_utils.h" #include "engine/surface_collision.h" struct RayIntersectionInfo { @@ -141,7 +140,7 @@ Collision* smlua_collision_util_get_current_terrain_collision(void); Collision *smlua_collision_util_get_level_collision(u32 level, u16 area); /* |description|Gets a table of the surface types from `data`|descriptionEnd| */ -LuaTable smlua_collision_util_find_surface_types(Collision* data); +void smlua_collision_util_find_surface_types(Collision* data); /* |description|Checks if the surface is quicksand|descriptionEnd| */ bool surface_is_quicksand(struct Surface* surf);