Moved smlua_XXX_utils.[ch] to src/pc/lua/utils/

Makefile

@@ -374,7 +374,7 @@ LEVEL_DIRS := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h)))
 
 # Hi, I'm a PC
 SRC_DIRS := src src/engine src/game src/audio src/menu src/buffers actors levels bin data assets src/pc src/pc/gfx src/pc/audio src/pc/controller src/pc/fs src/pc/fs/packtypes
-SRC_DIRS += src/pc/network src/pc/network/packets src/pc/network/socket src/pc/utils src/pc/djui src/pc/lua
+SRC_DIRS += src/pc/network src/pc/network/packets src/pc/network/socket src/pc/utils src/pc/djui src/pc/lua src/pc/lua/utils
 ASM_DIRS :=
 
 #ifeq ($(DISCORDRPC),1)

autogen/convert_constants.py

@@ -21,7 +21,7 @@ in_files = [
     "src/game/interaction.h",
     "src/pc/djui/djui_hud_utils.h",
     "include/behavior_table.h",
-    "src/pc/lua/smlua_model_utils.h",
+    "src/pc/lua/utils/smlua_model_utils.h",
     "include/object_constants.h",
     "include/mario_geo_switch_case_ids.h",
     "src/game/object_list_processor.h",

autogen/convert_functions.py

@@ -35,9 +35,9 @@ in_files = [
     "src/pc/djui/djui_hud_utils.h",
     "src/pc/network/network_player.h",
     "include/behavior_table.h",
-    "src/pc/lua/smlua_obj_utils.h",
-    "src/pc/lua/smlua_misc_utils.h",
-    'src/pc/lua/smlua_collision_utils.h',
+    "src/pc/lua/utils/smlua_obj_utils.h",
+    "src/pc/lua/utils/smlua_misc_utils.h",
+    'src/pc/lua/utils/smlua_collision_utils.h',
     "src/game/object_helpers.c",
     "src/game/obj_behaviors.c",
     "src/game/obj_behaviors_2.c",
@@ -77,7 +77,7 @@ override_disallowed_functions = {
 }
 
 lua_function_params = {
-    "src/pc/lua/smlua_obj_utils.h::spawn_object_sync::objSetupFunction": [ "struct Object*" ]
+    "src/pc/lua/utils/smlua_obj_utils.h::spawn_object_sync::objSetupFunction": [ "struct Object*" ]
 }
 
 ###########################################################

autogen/convert_structs.py

@@ -15,9 +15,9 @@ in_files = [
     'src/pc/djui/djui_hud_utils.h',
     'src/game/object_helpers.h',
     'src/game/mario_step.h',
-    'src/pc/lua/smlua_anim_utils.h',
-    'src/pc/lua/smlua_misc_utils.h',
-    'src/pc/lua/smlua_collision_utils.h',
+    'src/pc/lua/utils/smlua_anim_utils.h',
+    'src/pc/lua/utils/smlua_misc_utils.h',
+    'src/pc/lua/utils/smlua_collision_utils.h',
     'src/game/spawn_sound.h',
 ]
 

src/engine/level_script.c

@@ -23,7 +23,7 @@
 #include "surface_collision.h"
 #include "surface_load.h"
 #include "level_table.h"
-#include "src/pc/lua/smlua_model_utils.h"
+#include "src/pc/lua/utils/smlua_model_utils.h"
 
 #define CMD_GET(type, offset) (*(type *) (CMD_PROCESS_OFFSET(offset) + (u8 *) sCurrentCmd))
 

src/game/behavior_actions.c

@@ -46,7 +46,7 @@
 #include "thread6.h"
 #include "area.h"
 #include "game/rng_position.h"
-#include "pc/lua/smlua_model_utils.h"
+#include "pc/lua/utils/smlua_model_utils.h"
 
 #define o gCurrentObject
 

src/game/obj_behaviors_2.c

@@ -47,7 +47,7 @@
 #include "engine/surface_load.h"
 #include "pc/network/network.h"
 #include "pc/network/reservation_area.h"
-#include "pc/lua/smlua_model_utils.h"
+#include "pc/lua/utils/smlua_model_utils.h"
 
 #define POS_OP_SAVE_POSITION 0
 #define POS_OP_COMPUTE_VELOCITY 1

src/pc/lua/smlua_cobject.c

@@ -7,8 +7,8 @@
 #include "object_fields.h"
 #include "pc/djui/djui_hud_utils.h"
 #include "pc/lua/smlua.h"
-#include "pc/lua/smlua_anim_utils.h"
-#include "pc/lua/smlua_collision_utils.h"
+#include "pc/lua/utils/smlua_anim_utils.h"
+#include "pc/lua/utils/smlua_collision_utils.h"
 #include "pc/mod_list.h"
 
 #define LUA_VEC3S_FIELD_COUNT 3

src/pc/lua/smlua_cobject_autogen.c

@@ -10,9 +10,9 @@
 #include "src/pc/djui/djui_hud_utils.h"
 #include "src/game/object_helpers.h"
 #include "src/game/mario_step.h"
-#include "src/pc/lua/smlua_anim_utils.h"
-#include "src/pc/lua/smlua_misc_utils.h"
-#include "src/pc/lua/smlua_collision_utils.h"
+#include "src/pc/lua/utils/smlua_anim_utils.h"
+#include "src/pc/lua/utils/smlua_misc_utils.h"
+#include "src/pc/lua/utils/smlua_collision_utils.h"
 #include "src/game/spawn_sound.h"
 
 #include "include/object_fields.h"

src/pc/lua/smlua_functions_autogen.c

@@ -19,9 +19,9 @@
 #include "src/pc/djui/djui_hud_utils.h"
 #include "src/pc/network/network_player.h"
 #include "include/behavior_table.h"
-#include "src/pc/lua/smlua_obj_utils.h"
-#include "src/pc/lua/smlua_misc_utils.h"
-#include "src/pc/lua/smlua_collision_utils.h"
+#include "src/pc/lua/utils/smlua_obj_utils.h"
+#include "src/pc/lua/utils/smlua_misc_utils.h"
+#include "src/pc/lua/utils/smlua_collision_utils.h"
 #include "src/engine/surface_load.h"
 
 

src/pc/lua/utils/smlua_anim_utils.c

@@ -1,6 +1,6 @@
 #include "types.h"
 
-#include "smlua.h"
+#include "pc/lua/smlua.h"
 #include "smlua_anim_utils.h"
 #include "pc/debuglog.h"
 

src/pc/lua/utils/smlua_collision_utils.c

@@ -2,7 +2,7 @@
 
 #include "src/engine/surface_collision.h"
 
-#include "smlua.h"
+#include "pc/lua/smlua.h"
 #include "smlua_collision_utils.h"
 #include "pc/debuglog.h"
 

src/pc/lua/utils/smlua_misc_utils.c

@@ -1,6 +1,6 @@
 #include "types.h"
 
-#include "smlua.h"
+#include "pc/lua/smlua.h"
 #include "smlua_misc_utils.h"
 #include "pc/debuglog.h"
 

src/pc/lua/utils/smlua_obj_utils.c

@@ -3,7 +3,7 @@
 #include "object_fields.h"
 #include "src/game/object_helpers.h"
 
-#include "smlua.h"
+#include "pc/lua/smlua.h"
 #include "smlua_obj_utils.h"
 #include "smlua_model_utils.h"
 #include "pc/debuglog.h"

src/pc/network/packets/packet_spawn_objects.c

@@ -7,7 +7,7 @@
 #include "src/game/area.h"
 #include "behavior_data.h"
 #include "behavior_table.h"
-#include "src/pc/lua/smlua_model_utils.h"
+#include "src/pc/lua/utils/smlua_model_utils.h"
 //#define DISABLE_MODULE_LOG 1
 #include "pc/debuglog.h"