From a6b938df75b3836aa01439b8fb87414d3f5f280c Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:02:28 -0400 Subject: [PATCH] Shorten include paths by removing unnecessary "src/" --- actors/error_model/geo.inc.c | 2 - actors/waluigi/geo.inc.c | 2 - data/dynos.c.h | 2 +- data/dynos.cpp.h | 4 +- data/dynos_bin_behavior.cpp | 10 +-- data/dynos_bin_geo.cpp | 6 +- data/dynos_bin_lvl_validate.cpp | 4 +- data/dynos_bin_movtexqc.cpp | 2 +- data/dynos_c.cpp | 2 +- data/dynos_gfx_init.cpp | 2 +- data/dynos_mgr_movtexqc.cpp | 2 +- .../big-paddle/actors/big_paddle/geo.inc.c | 2 +- .../custom-level/actors/big_paddle/geo.inc.c | 2 +- .../custom-level/levels/bob/area_1/geo.inc.c | 2 +- include/level_commands.h | 2 +- include/types.h | 4 +- src/game/behavior_actions.c | 2 +- src/game/behaviors/texscroll.inc.c | 2 +- src/game/behaviors/tree_particles.inc.c | 2 +- src/game/game_init.c | 4 +- src/game/hardcoded.c | 2 +- src/game/ingame_menu.c | 2 +- src/game/macro_special_objects.c | 2 +- src/game/paintings.c | 2 +- src/pc/controller/controller_keyboard.c | 4 +- src/pc/crash_handler.c | 4 +- src/pc/djui/djui_bind.c | 4 +- src/pc/djui/djui_bind.h | 2 +- src/pc/djui/djui_gfx.c | 4 +- src/pc/djui/djui_image.c | 2 +- src/pc/djui/djui_interactable.c | 8 +- src/pc/djui/djui_panel.c | 6 +- src/pc/djui/djui_panel_camera.c | 6 +- src/pc/djui/djui_panel_confirm.c | 2 +- src/pc/djui/djui_panel_controls.c | 8 +- src/pc/djui/djui_panel_controls_extra.c | 2 +- src/pc/djui/djui_panel_controls_n64.c | 2 +- src/pc/djui/djui_panel_join_lobbies.c | 12 +-- src/pc/djui/djui_panel_join_message.c | 6 +- src/pc/djui/djui_panel_main.c | 6 +- src/pc/djui/djui_panel_menu.c | 4 +- src/pc/djui/djui_panel_menu_options.c | 6 +- src/pc/djui/djui_panel_sound.c | 4 +- src/pc/djui/djui_root.c | 4 +- src/pc/gfx/gfx_direct3d11.cpp | 2 +- src/pc/gfx/gfx_dxgi.cpp | 2 +- src/pc/gfx/gfx_sdl1.c | 4 +- src/pc/gfx/gfx_sdl2.c | 6 +- src/pc/lua/smlua_cobject_autogen.c | 40 +++++----- src/pc/lua/smlua_functions_autogen.c | 78 +++++++++---------- src/pc/lua/smlua_hooks.c | 4 +- src/pc/lua/smlua_utils.c | 2 +- src/pc/lua/utils/smlua_collision_utils.c | 2 +- src/pc/lua/utils/smlua_model_utils.c | 6 +- src/pc/lua/utils/smlua_model_utils.h | 2 +- src/pc/lua/utils/smlua_obj_utils.c | 4 +- src/pc/mods/mod.h | 2 +- src/pc/mods/mods.h | 2 +- src/pc/mods/mods_utils.h | 2 +- src/pc/network/network.c | 6 +- src/pc/network/packets/packet_collect_coin.c | 10 +-- src/pc/network/packets/packet_collect_item.c | 8 +- src/pc/network/packets/packet_collect_star.c | 6 +- src/pc/network/packets/packet_join.c | 12 +-- .../network/packets/packet_network_players.c | 2 +- src/pc/network/packets/packet_object.c | 10 +-- src/pc/network/packets/packet_spawn_objects.c | 4 +- src/pc/network/packets/packet_spawn_star.c | 2 +- 68 files changed, 189 insertions(+), 193 deletions(-) diff --git a/actors/error_model/geo.inc.c b/actors/error_model/geo.inc.c index d2152dd5..baab28c5 100644 --- a/actors/error_model/geo.inc.c +++ b/actors/error_model/geo.inc.c @@ -1,5 +1,3 @@ -#include "src/game/envfx_snow.h" - const GeoLayout error_model_geo[] = { GEO_NODE_START(), GEO_OPEN_NODE(), diff --git a/actors/waluigi/geo.inc.c b/actors/waluigi/geo.inc.c index c6cfc77a..334c8894 100644 --- a/actors/waluigi/geo.inc.c +++ b/actors/waluigi/geo.inc.c @@ -1,5 +1,3 @@ -#include "src/game/envfx_snow.h" - const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), diff --git a/data/dynos.c.h b/data/dynos.c.h index 98d845ec..ad7c9eca 100644 --- a/data/dynos.c.h +++ b/data/dynos.c.h @@ -5,7 +5,7 @@ #include "dynos.h" #include "types.h" #include "engine/behavior_script.h" -#include "src/game/moving_texture.h" +#include "game/moving_texture.h" void *dynos_swap_cmd(void *cmd); diff --git a/data/dynos.cpp.h b/data/dynos.cpp.h index da701bac..93dbce8b 100644 --- a/data/dynos.cpp.h +++ b/data/dynos.cpp.h @@ -7,8 +7,8 @@ extern "C" { #include "engine/behavior_script.h" #include "engine/math_util.h" -#include "src/game/moving_texture.h" -#include "src/pc/djui/djui_console.h" +#include "game/moving_texture.h" +#include "pc/djui/djui_console.h" } #define FUNCTION_CODE (u32) 0x434E5546 diff --git a/data/dynos_bin_behavior.cpp b/data/dynos_bin_behavior.cpp index 6a5e756c..62fa21e1 100644 --- a/data/dynos_bin_behavior.cpp +++ b/data/dynos_bin_behavior.cpp @@ -9,11 +9,11 @@ extern "C" { #include "include/model_ids.h" #include "include/object_constants.h" #include "include/object_fields.h" -#include "src/game/area.h" -#include "src/game/object_list_processor.h" -#include "src/game/interaction.h" -#include "src/pc/lua/utils/smlua_anim_utils.h" -#include "src/pc/lua/utils/smlua_collision_utils.h" +#include "game/area.h" +#include "game/object_list_processor.h" +#include "game/interaction.h" +#include "pc/lua/utils/smlua_anim_utils.h" +#include "pc/lua/utils/smlua_collision_utils.h" // Models and Animations #include "actors/common0.h" diff --git a/data/dynos_bin_geo.cpp b/data/dynos_bin_geo.cpp index d65d417f..dc6f75e1 100644 --- a/data/dynos_bin_geo.cpp +++ b/data/dynos_bin_geo.cpp @@ -2,9 +2,9 @@ extern "C" { #include "sm64.h" #include "geo_commands.h" -#include "src/game/camera.h" -#include "src/game/envfx_snow.h" -#include "src/game/paintings.h" +#include "game/camera.h" +#include "game/envfx_snow.h" +#include "game/paintings.h" } #pragma GCC diagnostic push diff --git a/data/dynos_bin_lvl_validate.cpp b/data/dynos_bin_lvl_validate.cpp index 40abd056..422d26a3 100644 --- a/data/dynos_bin_lvl_validate.cpp +++ b/data/dynos_bin_lvl_validate.cpp @@ -8,11 +8,11 @@ extern "C" { #include "include/surface_terrains.h" #include "include/seq_ids.h" #include "level_commands.h" -#include "src/game/level_update.h" +#include "game/level_update.h" #include "include/dialog_ids.h" #include "levels/scripts.h" #include "levels/menu/header.h" -#include "src/game/area.h" +#include "game/area.h" } #define POINTER 0xD34DB33F diff --git a/data/dynos_bin_movtexqc.cpp b/data/dynos_bin_movtexqc.cpp index 9cc78729..ab7e36a7 100644 --- a/data/dynos_bin_movtexqc.cpp +++ b/data/dynos_bin_movtexqc.cpp @@ -2,7 +2,7 @@ extern "C" { #include "include/level_misc_macros.h" -#include "src/game/moving_texture.h" +#include "game/moving_texture.h" } #pragma GCC diagnostic push diff --git a/data/dynos_c.cpp b/data/dynos_c.cpp index d766f187..a28b1577 100644 --- a/data/dynos_c.cpp +++ b/data/dynos_c.cpp @@ -1,6 +1,6 @@ #include "dynos.cpp.h" extern "C" { -#include "src/game/moving_texture.h" +#include "game/moving_texture.h" #include "game/hardcoded.h" void *dynos_swap_cmd(void *cmd) { diff --git a/data/dynos_gfx_init.cpp b/data/dynos_gfx_init.cpp index c05943ee..a28f8fab 100644 --- a/data/dynos_gfx_init.cpp +++ b/data/dynos_gfx_init.cpp @@ -1,5 +1,5 @@ #include "dynos.cpp.h" -#include "src/pc/loading.h" +#include "pc/loading.h" void DynOS_Gfx_GeneratePacks(const char* directory) { snprintf(gCurrLoadingSegment.str, 256, "Generating DynOS Packs In Path:\n\\#808080\\%s", directory); diff --git a/data/dynos_mgr_movtexqc.cpp b/data/dynos_mgr_movtexqc.cpp index e47b72f3..b4422b39 100644 --- a/data/dynos_mgr_movtexqc.cpp +++ b/data/dynos_mgr_movtexqc.cpp @@ -1,6 +1,6 @@ #include "dynos.cpp.h" extern "C" { -#include "src/game/area.h" +#include "game/area.h" } struct RegisteredMovtexQC { diff --git a/docs/lua/examples/big-paddle/actors/big_paddle/geo.inc.c b/docs/lua/examples/big-paddle/actors/big_paddle/geo.inc.c index a2acc99d..6a44389d 100644 --- a/docs/lua/examples/big-paddle/actors/big_paddle/geo.inc.c +++ b/docs/lua/examples/big-paddle/actors/big_paddle/geo.inc.c @@ -1,4 +1,4 @@ -#include "src/game/envfx_snow.h" +#include "game/envfx_snow.h" const GeoLayout big_paddle_geo[] = { GEO_NODE_START(), diff --git a/docs/lua/examples/custom-level/actors/big_paddle/geo.inc.c b/docs/lua/examples/custom-level/actors/big_paddle/geo.inc.c index a2acc99d..6a44389d 100644 --- a/docs/lua/examples/custom-level/actors/big_paddle/geo.inc.c +++ b/docs/lua/examples/custom-level/actors/big_paddle/geo.inc.c @@ -1,4 +1,4 @@ -#include "src/game/envfx_snow.h" +#include "game/envfx_snow.h" const GeoLayout big_paddle_geo[] = { GEO_NODE_START(), diff --git a/docs/lua/examples/custom-level/levels/bob/area_1/geo.inc.c b/docs/lua/examples/custom-level/levels/bob/area_1/geo.inc.c index c2fad38c..52c07a58 100644 --- a/docs/lua/examples/custom-level/levels/bob/area_1/geo.inc.c +++ b/docs/lua/examples/custom-level/levels/bob/area_1/geo.inc.c @@ -1,4 +1,4 @@ -#include "src/game/envfx_snow.h" +#include "game/envfx_snow.h" const GeoLayout bob_area_1_geo[] = { GEO_NODE_START(), diff --git a/include/level_commands.h b/include/level_commands.h index 7f6a5a5a..29474ca8 100644 --- a/include/level_commands.h +++ b/include/level_commands.h @@ -317,7 +317,7 @@ // README // /* When adding new level script commands, -you have to add the commadn to dynos_bin_lvl_validate.cpp's +you have to add the command to dynos_bin_lvl_validate.cpp's LvlCmd_Init(), and specify which params are pointers */ // README // diff --git a/include/types.h b/include/types.h index a0fd1fe1..184b81ec 100644 --- a/include/types.h +++ b/include/types.h @@ -7,7 +7,7 @@ #include #include "macros.h" #include "pc/network/version.h" -#include "src/pc/platform.h" +#include "pc/platform.h" // Certain functions are marked as having return values, but do not // actually return a value. This causes undefined behavior, which we'd rather @@ -450,7 +450,7 @@ struct TextureInfo #define COOP_OBJ_FLAG_NON_SYNC (1 << 2) #define COOP_OBJ_FLAG_INITIALIZED (1 << 3) -#include "src/game/characters.h" +#include "game/characters.h" #include "data/dynos.c.h" #endif // _SM64_TYPES_H_ diff --git a/src/game/behavior_actions.c b/src/game/behavior_actions.c index 4aac7922..f2d4f60c 100644 --- a/src/game/behavior_actions.c +++ b/src/game/behavior_actions.c @@ -1,6 +1,6 @@ #include -#include "src/pc/network/network.h" +#include "pc/network/network.h" #include "types.h" #include "actors/common1.h" #include "actors/group12.h" diff --git a/src/game/behaviors/texscroll.inc.c b/src/game/behaviors/texscroll.inc.c index 7718a09f..c2a725ed 100644 --- a/src/game/behaviors/texscroll.inc.c +++ b/src/game/behaviors/texscroll.inc.c @@ -7,7 +7,7 @@ #include #include "engine/math_util.h" -#include "src/game/scroll_targets.h" +#include "game/scroll_targets.h" #include "pc/pc_main.h" #include "pc/utils/misc.h" diff --git a/src/game/behaviors/tree_particles.inc.c b/src/game/behaviors/tree_particles.inc.c index ad704fc3..aecdb1a4 100644 --- a/src/game/behaviors/tree_particles.inc.c +++ b/src/game/behaviors/tree_particles.inc.c @@ -1,6 +1,6 @@ // tree_particles.c.inc -#include "src/game/envfx_snow.h" +#include "game/envfx_snow.h" void bhv_tree_snow_or_leaf_loop(void) { cur_obj_update_floor_height(); diff --git a/src/game/game_init.c b/src/game/game_init.c index 100d3544..abc62de7 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -20,8 +20,8 @@ #include "segment2.h" #include "segment_symbols.h" #include "rng_position.h" -#include "src/pc/djui/djui.h" -#include "src/pc/djui/djui_panel_pause.h" +#include "pc/djui/djui.h" +#include "pc/djui/djui_panel_pause.h" #include "rumble_init.h" #include #include "bettercamera.h" diff --git a/src/game/hardcoded.c b/src/game/hardcoded.c index ea63e8b9..f745b730 100644 --- a/src/game/hardcoded.c +++ b/src/game/hardcoded.c @@ -34,7 +34,7 @@ #include "levels/wf/header.h" #include "levels/wmotr/header.h" -#include "src/pc/pc_main.h" +#include "pc/pc_main.h" extern Trajectory sThiHugeMetalBallTraj[]; extern Trajectory sThiTinyMetalBallTraj[]; diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index 53e717c5..12de05f5 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -28,7 +28,7 @@ #include "hardcoded.h" #include "pc/network/network.h" #include "pc/djui/djui.h" -#include "src/pc/djui/djui_panel_pause.h" +#include "pc/djui/djui_panel_pause.h" #include "pc/utils/misc.h" #include "data/dynos_mgr_builtin_externs.h" #include "hud.h" diff --git a/src/game/macro_special_objects.c b/src/game/macro_special_objects.c index 1a55e911..a16996ac 100644 --- a/src/game/macro_special_objects.c +++ b/src/game/macro_special_objects.c @@ -10,7 +10,7 @@ #include "macro_presets.h" #include "special_presets.h" -#include "src/pc/network/sync_object.h" +#include "pc/network/sync_object.h" /* * Converts the rotation value supplied by macro objects into one * that can be used by in-game objects. diff --git a/src/game/paintings.c b/src/game/paintings.c index a08b00ee..574e6bc4 100644 --- a/src/game/paintings.c +++ b/src/game/paintings.c @@ -19,7 +19,7 @@ #include "pc/utils/misc.h" #include "obj_behaviors.h" #include "level_update.h" -#include "src/pc/network/network_player.h" +#include "pc/network/network_player.h" #include "print.h" #include "hardcoded.h" diff --git a/src/pc/controller/controller_keyboard.c b/src/pc/controller/controller_keyboard.c index 6a250dd0..d859c95b 100644 --- a/src/pc/controller/controller_keyboard.c +++ b/src/pc/controller/controller_keyboard.c @@ -12,8 +12,8 @@ #include "pc/pc_main.h" #include "engine/math_util.h" #include "menu/file_select.h" -#include "src/pc/djui/djui.h" -#include "src/pc/djui/djui_panel_pause.h" +#include "pc/djui/djui.h" +#include "pc/djui/djui_panel_pause.h" static int keyboard_buttons_down; diff --git a/src/pc/crash_handler.c b/src/pc/crash_handler.c index f7be2b28..c99db192 100644 --- a/src/pc/crash_handler.c +++ b/src/pc/crash_handler.c @@ -21,8 +21,8 @@ char gLastRemoteBhv[256] = ""; #include "game/segment2.h" #include "game/mario.h" #include "gfx_dimensions.h" -#include "src/pc/djui/djui.h" -#include "src/pc/djui/djui_unicode.h" +#include "pc/djui/djui.h" +#include "pc/djui/djui_unicode.h" #include "pc/network/network.h" #include "pc/gfx/gfx_rendering_api.h" #include "pc/mods/mods.h" diff --git a/src/pc/djui/djui_bind.c b/src/pc/djui/djui_bind.c index 90f5a626..6f0dd9ec 100644 --- a/src/pc/djui/djui_bind.c +++ b/src/pc/djui/djui_bind.c @@ -1,8 +1,8 @@ #include #include #include "djui.h" -#include "src/pc/controller/controller_api.h" -#include "src/pc/controller/controller_bind_mapping.h" +#include "pc/controller/controller_api.h" +#include "pc/controller/controller_bind_mapping.h" #include "sounds.h" #include "audio/external.h" diff --git a/src/pc/djui/djui_bind.h b/src/pc/djui/djui_bind.h index 115b9829..4d26fce4 100644 --- a/src/pc/djui/djui_bind.h +++ b/src/pc/djui/djui_bind.h @@ -1,6 +1,6 @@ #pragma once #include "djui.h" -#include "src/pc/configfile.h" +#include "pc/configfile.h" struct DjuiBind { struct DjuiBase base; diff --git a/src/pc/djui/djui_gfx.c b/src/pc/djui/djui_gfx.c index a1471e65..1836e751 100644 --- a/src/pc/djui/djui_gfx.c +++ b/src/pc/djui/djui_gfx.c @@ -3,8 +3,8 @@ #include "djui.h" #include "game/ingame_menu.h" #include "game/segment2.h" -#include "src/pc/pc_main.h" -#include "src/pc/gfx/gfx_window_manager_api.h" +#include "pc/pc_main.h" +#include "pc/gfx/gfx_window_manager_api.h" #include "gfx_dimensions.h" #include "djui_gfx.h" #include "pc/debuglog.h" diff --git a/src/pc/djui/djui_image.c b/src/pc/djui/djui_image.c index 5f76a973..f227421c 100644 --- a/src/pc/djui/djui_image.c +++ b/src/pc/djui/djui_image.c @@ -1,6 +1,6 @@ #include "djui.h" #include "game/segment2.h" -#include "src/pc/network/network.h" +#include "pc/network/network.h" //////////////// // properties // diff --git a/src/pc/djui/djui_interactable.c b/src/pc/djui/djui_interactable.c index 4c205367..0a971125 100644 --- a/src/pc/djui/djui_interactable.c +++ b/src/pc/djui/djui_interactable.c @@ -5,10 +5,10 @@ #include "djui_panel_modlist.h" #include "djui_panel_playerlist.h" -#include "src/pc/controller/controller_sdl.h" -#include "src/pc/controller/controller_mouse.h" -#include "src/pc/controller/controller_keyboard.h" -#include "src/pc/utils/misc.h" +#include "pc/controller/controller_sdl.h" +#include "pc/controller/controller_mouse.h" +#include "pc/controller/controller_keyboard.h" +#include "pc/utils/misc.h" #include "pc/network/network.h" #include "sounds.h" diff --git a/src/pc/djui/djui_panel.c b/src/pc/djui/djui_panel.c index c2dac703..cfc15731 100644 --- a/src/pc/djui/djui_panel.c +++ b/src/pc/djui/djui_panel.c @@ -3,11 +3,11 @@ #include "djui_panel_main.h" #include "djui_panel_pause.h" #include "djui_panel_join_message.h" -#include "src/pc/debuglog.h" -#include "src/pc/utils/misc.h" +#include "pc/debuglog.h" +#include "pc/utils/misc.h" #include "sounds.h" #include "audio/external.h" -#include "src/game/bettercamera.h" +#include "game/bettercamera.h" static struct DjuiPanel* sPanelList = NULL; static struct DjuiPanel* sPanelRemoving = NULL; diff --git a/src/pc/djui/djui_panel_camera.c b/src/pc/djui/djui_panel_camera.c index 34714226..bf8a03d2 100644 --- a/src/pc/djui/djui_panel_camera.c +++ b/src/pc/djui/djui_panel_camera.c @@ -1,9 +1,9 @@ #include "djui.h" #include "djui_panel.h" #include "djui_panel_menu.h" -#include "src/pc/utils/misc.h" -#include "src/pc/configfile.h" -#include "src/game/bettercamera.h" +#include "pc/utils/misc.h" +#include "pc/configfile.h" +#include "game/bettercamera.h" void djui_panel_camera_value_changed(UNUSED struct DjuiBase* caller) { newcam_init_settings(); diff --git a/src/pc/djui/djui_panel_confirm.c b/src/pc/djui/djui_panel_confirm.c index d5ce9c54..18f9ce1f 100644 --- a/src/pc/djui/djui_panel_confirm.c +++ b/src/pc/djui/djui_panel_confirm.c @@ -1,7 +1,7 @@ #include "djui.h" #include "djui_panel.h" #include "djui_panel_menu.h" -#include "src/pc/utils/misc.h" +#include "pc/utils/misc.h" void djui_panel_confirm_create(struct DjuiBase* caller, char* title, char* message, void (*on_yes_click)(struct DjuiBase*)) { struct DjuiThreePanel* panel = djui_panel_menu_create(title); diff --git a/src/pc/djui/djui_panel_controls.c b/src/pc/djui/djui_panel_controls.c index 568c5613..23267bf4 100644 --- a/src/pc/djui/djui_panel_controls.c +++ b/src/pc/djui/djui_panel_controls.c @@ -3,10 +3,10 @@ #include "djui_panel_menu.h" #include "djui_panel_controls_n64.h" #include "djui_panel_controls_extra.h" -#include "src/pc/utils/misc.h" -#include "src/pc/configfile.h" -#include "src/pc/controller/controller_api.h" -#include "src/pc/controller/controller_sdl.h" +#include "pc/utils/misc.h" +#include "pc/configfile.h" +#include "pc/controller/controller_api.h" +#include "pc/controller/controller_sdl.h" void djui_panel_controls_value_change(UNUSED struct DjuiBase* caller) { controller_reconfigure(); diff --git a/src/pc/djui/djui_panel_controls_extra.c b/src/pc/djui/djui_panel_controls_extra.c index 92772d57..54f8a80e 100644 --- a/src/pc/djui/djui_panel_controls_extra.c +++ b/src/pc/djui/djui_panel_controls_extra.c @@ -1,7 +1,7 @@ #include "djui.h" #include "djui_panel.h" #include "djui_panel_menu.h" -#include "src/pc/configfile.h" +#include "pc/configfile.h" void djui_panel_controls_extra_create(struct DjuiBase* caller) { f32 bindBodyHeight = 28 * 12 + 1 * 10; diff --git a/src/pc/djui/djui_panel_controls_n64.c b/src/pc/djui/djui_panel_controls_n64.c index ed5c8aec..0359902e 100644 --- a/src/pc/djui/djui_panel_controls_n64.c +++ b/src/pc/djui/djui_panel_controls_n64.c @@ -1,7 +1,7 @@ #include "djui.h" #include "djui_panel.h" #include "djui_panel_menu.h" -#include "src/pc/configfile.h" +#include "pc/configfile.h" void djui_panel_controls_n64_create(struct DjuiBase* caller) { f32 bindBodyHeight = 28 * 14 + 1 * 13; diff --git a/src/pc/djui/djui_panel_join_lobbies.c b/src/pc/djui/djui_panel_join_lobbies.c index 2e1291cd..347303ec 100644 --- a/src/pc/djui/djui_panel_join_lobbies.c +++ b/src/pc/djui/djui_panel_join_lobbies.c @@ -4,12 +4,12 @@ #include "djui_panel_menu.h" #include "djui_panel_join_message.h" #include "djui_lobby_entry.h" -#include "src/pc/network/network.h" -#include "src/pc/network/socket/socket.h" -#include "src/pc/network/coopnet/coopnet.h" -#include "src/pc/utils/misc.h" -#include "src/pc/configfile.h" -#include "src/pc/debuglog.h" +#include "pc/network/network.h" +#include "pc/network/socket/socket.h" +#include "pc/network/coopnet/coopnet.h" +#include "pc/utils/misc.h" +#include "pc/configfile.h" +#include "pc/debuglog.h" #include "macros.h" #ifdef COOPNET diff --git a/src/pc/djui/djui_panel_join_message.c b/src/pc/djui/djui_panel_join_message.c index 2eadfe30..82c96ba8 100644 --- a/src/pc/djui/djui_panel_join_message.c +++ b/src/pc/djui/djui_panel_join_message.c @@ -3,9 +3,9 @@ #include "djui_panel_menu.h" #include "djui_panel_main.h" #include "djui_panel_join_message.h" -#include "src/pc/network/network.h" -#include "src/pc/utils/misc.h" -#include "src/pc/configfile.h" +#include "pc/network/network.h" +#include "pc/utils/misc.h" +#include "pc/configfile.h" #define DJUI_JOIN_MESSAGE_ELAPSE 60 bool gDjuiPanelJoinMessageVisible = false; diff --git a/src/pc/djui/djui_panel_main.c b/src/pc/djui/djui_panel_main.c index 3df155be..faa457bf 100644 --- a/src/pc/djui/djui_panel_main.c +++ b/src/pc/djui/djui_panel_main.c @@ -5,9 +5,9 @@ #include "djui_panel_options.h" #include "djui_panel_menu.h" #include "djui_panel_confirm.h" -#include "src/pc/controller/controller_sdl.h" -#include "src/pc/pc_main.h" -#include "src/pc/update_checker.h" +#include "pc/controller/controller_sdl.h" +#include "pc/pc_main.h" +#include "pc/update_checker.h" extern ALIGNED8 u8 texture_coopdx_logo[]; diff --git a/src/pc/djui/djui_panel_menu.c b/src/pc/djui/djui_panel_menu.c index c14b78c0..6a4997e9 100644 --- a/src/pc/djui/djui_panel_menu.c +++ b/src/pc/djui/djui_panel_menu.c @@ -1,8 +1,8 @@ #include "djui.h" #include "djui_panel.h" #include "djui_unicode.h" -#include "src/pc/utils/misc.h" -#include "src/pc/configfile.h" +#include "pc/utils/misc.h" +#include "pc/configfile.h" #define RAINBOW_TEXT_LEN 255 diff --git a/src/pc/djui/djui_panel_menu_options.c b/src/pc/djui/djui_panel_menu_options.c index c50f50a8..a31c0f22 100644 --- a/src/pc/djui/djui_panel_menu_options.c +++ b/src/pc/djui/djui_panel_menu_options.c @@ -6,9 +6,9 @@ #include "djui_panel_options.h" #include "djui_panel_misc.h" #include "djui_panel_pause.h" -#include "src/pc/utils/misc.h" -#include "src/pc/configfile.h" -#include "src/game/level_update.h" +#include "pc/utils/misc.h" +#include "pc/configfile.h" +#include "game/level_update.h" static struct DjuiSelectionbox* sLevelBox = NULL; static struct DjuiCheckbox* sUseStageMusicCheckbox = NULL; diff --git a/src/pc/djui/djui_panel_sound.c b/src/pc/djui/djui_panel_sound.c index 7fd16d20..f22f2ab8 100644 --- a/src/pc/djui/djui_panel_sound.c +++ b/src/pc/djui/djui_panel_sound.c @@ -1,8 +1,8 @@ #include "djui.h" #include "djui_panel.h" #include "djui_panel_menu.h" -#include "src/pc/utils/misc.h" -#include "src/pc/configfile.h" +#include "pc/utils/misc.h" +#include "pc/configfile.h" void djui_panel_sound_create(struct DjuiBase* caller) { struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(SOUND, SOUND)); diff --git a/src/pc/djui/djui_root.c b/src/pc/djui/djui_root.c index 8270d59e..3c7437c0 100644 --- a/src/pc/djui/djui_root.c +++ b/src/pc/djui/djui_root.c @@ -1,6 +1,6 @@ #include "djui.h" -#include "src/pc/pc_main.h" -#include "src/pc/gfx/gfx_window_manager_api.h" +#include "pc/pc_main.h" +#include "pc/gfx/gfx_window_manager_api.h" static bool djui_root_render(struct DjuiBase* base) { // grab window height diff --git a/src/pc/gfx/gfx_direct3d11.cpp b/src/pc/gfx/gfx_direct3d11.cpp index 6865f85b..69796c45 100644 --- a/src/pc/gfx/gfx_direct3d11.cpp +++ b/src/pc/gfx/gfx_direct3d11.cpp @@ -23,7 +23,7 @@ #include "gfx_direct3d_common.h" extern "C" { - #include "src/pc/controller/controller_bind_mapping.h" + #include "pc/controller/controller_bind_mapping.h" } #define DECLARE_GFX_DXGI_FUNCTIONS diff --git a/src/pc/gfx/gfx_dxgi.cpp b/src/pc/gfx/gfx_dxgi.cpp index 6230bc21..602b792f 100644 --- a/src/pc/gfx/gfx_dxgi.cpp +++ b/src/pc/gfx/gfx_dxgi.cpp @@ -24,7 +24,7 @@ #include "gfx_dxgi.h" extern "C" { -#include "src/pc/mods/mod_import.h" +#include "pc/mods/mod_import.h" #ifdef DISCORD_SDK #include "pc/discord/discord.h" #endif diff --git a/src/pc/gfx/gfx_sdl1.c b/src/pc/gfx/gfx_sdl1.c index 7659a58d..e0073355 100644 --- a/src/pc/gfx/gfx_sdl1.c +++ b/src/pc/gfx/gfx_sdl1.c @@ -22,8 +22,8 @@ #include "../cliopts.h" #include "../platform.h" -#include "src/pc/controller/controller_keyboard.h" -#include "src/pc/controller/controller_bind_mapping.h" +#include "pc/controller/controller_keyboard.h" +#include "pc/controller/controller_bind_mapping.h" // TODO: figure out if this shit even works #ifdef VERSION_EU diff --git a/src/pc/gfx/gfx_sdl2.c b/src/pc/gfx/gfx_sdl2.c index dab9e0e3..36f3b4e2 100644 --- a/src/pc/gfx/gfx_sdl2.c +++ b/src/pc/gfx/gfx_sdl2.c @@ -37,9 +37,9 @@ #include "../configfile.h" #include "../cliopts.h" -#include "src/pc/controller/controller_keyboard.h" -#include "src/pc/controller/controller_sdl.h" -#include "src/pc/controller/controller_bind_mapping.h" +#include "pc/controller/controller_keyboard.h" +#include "pc/controller/controller_sdl.h" +#include "pc/controller/controller_bind_mapping.h" #include "pc/utils/misc.h" #include "pc/mods/mod_import.h" #include "pc/rom_checker.h" diff --git a/src/pc/lua/smlua_cobject_autogen.c b/src/pc/lua/smlua_cobject_autogen.c index b2f5914c..4ec470c1 100644 --- a/src/pc/lua/smlua_cobject_autogen.c +++ b/src/pc/lua/smlua_cobject_autogen.c @@ -2,26 +2,26 @@ /* SHOULD NOT BE MANUALLY CHANGED */ #include "smlua.h" #include "include/types.h" -#include "src/game/area.h" -#include "src/game/camera.h" -#include "src/game/characters.h" -#include "src/engine/surface_collision.h" -#include "src/pc/network/network_player.h" -#include "src/pc/djui/djui_hud_utils.h" -#include "src/game/object_helpers.h" -#include "src/game/mario_step.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/pc/lua/utils/smlua_level_utils.h" -#include "src/game/spawn_sound.h" -#include "src/pc/network/network.h" -#include "src/game/hardcoded.h" -#include "src/pc/mods/mod.h" -#include "src/pc/lua/utils/smlua_audio_utils.h" -#include "src/game/paintings.h" -#include "src/pc/djui/djui_types.h" -#include "src/game/first_person_cam.h" +#include "game/area.h" +#include "game/camera.h" +#include "game/characters.h" +#include "engine/surface_collision.h" +#include "pc/network/network_player.h" +#include "pc/djui/djui_hud_utils.h" +#include "game/object_helpers.h" +#include "game/mario_step.h" +#include "pc/lua/utils/smlua_anim_utils.h" +#include "pc/lua/utils/smlua_misc_utils.h" +#include "pc/lua/utils/smlua_collision_utils.h" +#include "pc/lua/utils/smlua_level_utils.h" +#include "game/spawn_sound.h" +#include "pc/network/network.h" +#include "game/hardcoded.h" +#include "pc/mods/mod.h" +#include "pc/lua/utils/smlua_audio_utils.h" +#include "game/paintings.h" +#include "pc/djui/djui_types.h" +#include "game/first_person_cam.h" #include "include/object_fields.h" diff --git a/src/pc/lua/smlua_functions_autogen.c b/src/pc/lua/smlua_functions_autogen.c index 637713a4..54c7c0b7 100644 --- a/src/pc/lua/smlua_functions_autogen.c +++ b/src/pc/lua/smlua_functions_autogen.c @@ -3,46 +3,46 @@ #include "smlua.h" -#include "src/audio/external.h" -#include "src/engine/math_util.h" -#include "src/engine/surface_collision.h" -#include "src/engine/surface_load.h" -#include "src/game/camera.h" -#include "src/game/characters.h" -#include "src/game/mario_step.h" -#include "src/game/mario.h" -#include "src/pc/djui/djui_popup.h" -#include "src/pc/network/network_utils.h" -#include "src/pc/djui/djui_console.h" -#include "src/pc/djui/djui_chat_message.h" -#include "src/game/interaction.h" -#include "src/game/level_info.h" -#include "src/game/save_file.h" -#include "src/game/sound_init.h" -#include "src/pc/djui/djui_hud_utils.h" -#include "src/pc/network/network_player.h" -#include "src/pc/network/lag_compensation.h" +#include "audio/external.h" +#include "engine/math_util.h" +#include "engine/surface_collision.h" +#include "engine/surface_load.h" +#include "game/camera.h" +#include "game/characters.h" +#include "game/mario_step.h" +#include "game/mario.h" +#include "pc/djui/djui_popup.h" +#include "pc/network/network_utils.h" +#include "pc/djui/djui_console.h" +#include "pc/djui/djui_chat_message.h" +#include "game/interaction.h" +#include "game/level_info.h" +#include "game/save_file.h" +#include "game/sound_init.h" +#include "pc/djui/djui_hud_utils.h" +#include "pc/network/network_player.h" +#include "pc/network/lag_compensation.h" #include "include/behavior_table.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/pc/lua/utils/smlua_math_utils.h" -#include "src/pc/lua/utils/smlua_model_utils.h" -#include "src/pc/lua/utils/smlua_text_utils.h" -#include "src/pc/lua/utils/smlua_audio_utils.h" -#include "src/pc/lua/utils/smlua_level_utils.h" -#include "src/pc/lua/utils/smlua_anim_utils.h" -#include "src/pc/lua/utils/smlua_deprecated.h" -#include "src/game/object_list_processor.h" -#include "src/game/behavior_actions.h" -#include "src/game/mario_misc.h" -#include "src/pc/mods/mod_storage.h" -#include "src/pc/utils/misc.h" -#include "src/game/level_update.h" -#include "src/game/area.h" -#include "src/engine/level_script.h" -#include "src/game/ingame_menu.h" -#include "src/game/first_person_cam.h" +#include "pc/lua/utils/smlua_obj_utils.h" +#include "pc/lua/utils/smlua_misc_utils.h" +#include "pc/lua/utils/smlua_collision_utils.h" +#include "pc/lua/utils/smlua_math_utils.h" +#include "pc/lua/utils/smlua_model_utils.h" +#include "pc/lua/utils/smlua_text_utils.h" +#include "pc/lua/utils/smlua_audio_utils.h" +#include "pc/lua/utils/smlua_level_utils.h" +#include "pc/lua/utils/smlua_anim_utils.h" +#include "pc/lua/utils/smlua_deprecated.h" +#include "game/object_list_processor.h" +#include "game/behavior_actions.h" +#include "game/mario_misc.h" +#include "pc/mods/mod_storage.h" +#include "pc/utils/misc.h" +#include "game/level_update.h" +#include "game/area.h" +#include "engine/level_script.h" +#include "game/ingame_menu.h" +#include "game/first_person_cam.h" //////////// diff --git a/src/pc/lua/smlua_hooks.c b/src/pc/lua/smlua_hooks.c index e296b9ab..c6c16bda 100644 --- a/src/pc/lua/smlua_hooks.c +++ b/src/pc/lua/smlua_hooks.c @@ -5,10 +5,10 @@ #include "sm64.h" #include "behavior_commands.h" #include "pc/mods/mod.h" -#include "src/game/object_list_processor.h" +#include "game/object_list_processor.h" #include "pc/djui/djui_chat_message.h" #include "pc/crash_handler.h" -#include "src/game/hud.h" +#include "game/hud.h" #include "pc/debug_context.h" #include "pc/network/network.h" #include "pc/network/network_player.h" diff --git a/src/pc/lua/smlua_utils.c b/src/pc/lua/smlua_utils.c index 96bd3eda..da91fd4b 100644 --- a/src/pc/lua/smlua_utils.c +++ b/src/pc/lua/smlua_utils.c @@ -1,5 +1,5 @@ #include "smlua.h" -#include "src/pc/mods/mods.h" +#include "pc/mods/mods.h" #include "audio/external.h" u8 gSmLuaConvertSuccess = false; diff --git a/src/pc/lua/utils/smlua_collision_utils.c b/src/pc/lua/utils/smlua_collision_utils.c index 7a643928..824be2a8 100644 --- a/src/pc/lua/utils/smlua_collision_utils.c +++ b/src/pc/lua/utils/smlua_collision_utils.c @@ -1,6 +1,6 @@ #include "types.h" -#include "src/engine/surface_collision.h" +#include "engine/surface_collision.h" #include "include/surface_terrains.h" #include "game/mario_step.h" diff --git a/src/pc/lua/utils/smlua_model_utils.c b/src/pc/lua/utils/smlua_model_utils.c index f27839a5..954f5e60 100644 --- a/src/pc/lua/utils/smlua_model_utils.c +++ b/src/pc/lua/utils/smlua_model_utils.c @@ -2,9 +2,9 @@ #include "types.h" #include "geo_commands.h" -#include "src/game/area.h" -#include "src/engine/graph_node.h" -#include "src/engine/level_script.h" +#include "game/area.h" +#include "engine/graph_node.h" +#include "engine/level_script.h" // models #include "actors/common0.h" diff --git a/src/pc/lua/utils/smlua_model_utils.h b/src/pc/lua/utils/smlua_model_utils.h index c0243170..14e0b73d 100644 --- a/src/pc/lua/utils/smlua_model_utils.h +++ b/src/pc/lua/utils/smlua_model_utils.h @@ -1,7 +1,7 @@ #ifndef SMLUA_MODEL_UTILS_H #define SMLUA_MODEL_UTILS_H -#include "src/game/memory.h" +#include "game/memory.h" enum ModelExtendedId { E_MODEL_NONE, diff --git a/src/pc/lua/utils/smlua_obj_utils.c b/src/pc/lua/utils/smlua_obj_utils.c index 9c27003e..e2a5e955 100644 --- a/src/pc/lua/utils/smlua_obj_utils.c +++ b/src/pc/lua/utils/smlua_obj_utils.c @@ -1,8 +1,8 @@ #include "types.h" #include "object_constants.h" #include "object_fields.h" -#include "src/game/object_helpers.h" -#include "src/game/interaction.h" +#include "game/object_helpers.h" +#include "game/interaction.h" #include "engine/math_util.h" #include "pc/lua/smlua.h" diff --git a/src/pc/mods/mod.h b/src/pc/mods/mod.h index 56f49bb0..3bf71aad 100644 --- a/src/pc/mods/mod.h +++ b/src/pc/mods/mod.h @@ -3,7 +3,7 @@ #include "PR/ultratypes.h" #include -#include "src/pc/platform.h" +#include "pc/platform.h" #define MOD_NAME_MAX_LENGTH 64 #define MOD_INCOMPATIBLE_MAX_LENGTH 256 diff --git a/src/pc/mods/mods.h b/src/pc/mods/mods.h index 75b08770..2935ba15 100644 --- a/src/pc/mods/mods.h +++ b/src/pc/mods/mods.h @@ -3,7 +3,7 @@ #include "PR/ultratypes.h" #include -#include "src/pc/platform.h" +#include "pc/platform.h" #include "mod.h" #define MAX_MOD_SIZE (35 * 1048576) // 35MB diff --git a/src/pc/mods/mods_utils.h b/src/pc/mods/mods_utils.h index a217a444..6aa3de8e 100644 --- a/src/pc/mods/mods_utils.h +++ b/src/pc/mods/mods_utils.h @@ -3,7 +3,7 @@ #include "PR/ultratypes.h" #include -#include "src/pc/platform.h" +#include "pc/platform.h" void mods_size_enforce(struct Mods* mods); void mods_update_selectable(void); diff --git a/src/pc/network/network.c b/src/pc/network/network.c index ce3e1810..1b3f530b 100644 --- a/src/pc/network/network.c +++ b/src/pc/network/network.c @@ -6,8 +6,8 @@ #include "game/level_update.h" #include "object_constants.h" #include "behavior_table.h" -#include "src/game/hardcoded.h" -#include "src/game/scroll_targets.h" +#include "game/hardcoded.h" +#include "game/scroll_targets.h" #include "pc/configfile.h" #include "pc/djui/djui.h" #include "pc/djui/djui_panel.h" @@ -37,7 +37,7 @@ // fix warnings when including rendering_graph_node #undef near #undef far -#include "src/game/rendering_graph_node.h" +#include "game/rendering_graph_node.h" // Mario 64 specific externs extern s16 sCurrPlayMode; diff --git a/src/pc/network/packets/packet_collect_coin.c b/src/pc/network/packets/packet_collect_coin.c index add47f58..656c4359 100644 --- a/src/pc/network/packets/packet_collect_coin.c +++ b/src/pc/network/packets/packet_collect_coin.c @@ -4,11 +4,11 @@ #include "object_constants.h" #include "behavior_table.h" #include "course_table.h" -#include "src/game/hardcoded.h" -#include "src/game/interaction.h" -#include "src/engine/math_util.h" -#include "src/game/memory.h" -#include "src/game/object_helpers.h" +#include "game/hardcoded.h" +#include "game/interaction.h" +#include "engine/math_util.h" +#include "game/memory.h" +#include "game/object_helpers.h" #include "pc/lua/smlua_hooks.h" #include "pc/debuglog.h" diff --git a/src/pc/network/packets/packet_collect_item.c b/src/pc/network/packets/packet_collect_item.c index 57b0b355..bea4209e 100644 --- a/src/pc/network/packets/packet_collect_item.c +++ b/src/pc/network/packets/packet_collect_item.c @@ -4,10 +4,10 @@ #include "object_constants.h" #include "behavior_table.h" #include "course_table.h" -#include "src/game/interaction.h" -#include "src/engine/math_util.h" -#include "src/game/memory.h" -#include "src/game/object_helpers.h" +#include "game/interaction.h" +#include "engine/math_util.h" +#include "game/memory.h" +#include "game/object_helpers.h" #include "pc/lua/smlua_hooks.h" static f32 dist_to_pos(struct Object* o, f32* pos) { diff --git a/src/pc/network/packets/packet_collect_star.c b/src/pc/network/packets/packet_collect_star.c index ad77fd2f..5daa7ecc 100644 --- a/src/pc/network/packets/packet_collect_star.c +++ b/src/pc/network/packets/packet_collect_star.c @@ -5,9 +5,9 @@ #include "object_fields.h" #include "object_constants.h" #include "game/interaction.h" -#include "src/game/memory.h" -#include "src/game/object_helpers.h" -#include "src/game/save_file.h" +#include "game/memory.h" +#include "game/object_helpers.h" +#include "game/save_file.h" #include "pc/lua/smlua_hooks.h" #include "pc/debuglog.h" diff --git a/src/pc/network/packets/packet_join.c b/src/pc/network/packets/packet_join.c index 573fc597..5f4eef0a 100644 --- a/src/pc/network/packets/packet_join.c +++ b/src/pc/network/packets/packet_join.c @@ -4,12 +4,12 @@ #include "object_constants.h" #include "behavior_table.h" #include "course_table.h" -#include "src/game/interaction.h" -#include "src/engine/math_util.h" -#include "src/game/save_file.h" -#include "src/game/level_update.h" -#include "src/game/hardcoded.h" -#include "src/pc/fs/fs.h" +#include "game/interaction.h" +#include "engine/math_util.h" +#include "game/save_file.h" +#include "game/level_update.h" +#include "game/hardcoded.h" +#include "pc/fs/fs.h" #include "PR/os_eeprom.h" #include "pc/network/version.h" #include "pc/djui/djui.h" diff --git a/src/pc/network/packets/packet_network_players.c b/src/pc/network/packets/packet_network_players.c index 4fc25d2e..68cc2cb8 100644 --- a/src/pc/network/packets/packet_network_players.c +++ b/src/pc/network/packets/packet_network_players.c @@ -2,7 +2,7 @@ #include "../network.h" #include "object_fields.h" #include "behavior_data.h" -#include "src/game/behavior_actions.h" +#include "game/behavior_actions.h" #include "pc/debuglog.h" #include "pc/configfile.h" #include "pc/network/moderator_list.h" diff --git a/src/pc/network/packets/packet_object.c b/src/pc/network/packets/packet_object.c index 10ea8535..459e051d 100644 --- a/src/pc/network/packets/packet_object.c +++ b/src/pc/network/packets/packet_object.c @@ -5,11 +5,11 @@ #include "object_constants.h" #include "behavior_data.h" #include "behavior_table.h" -#include "src/game/memory.h" -#include "src/game/object_helpers.h" -#include "src/game/obj_behaviors.h" -#include "src/game/object_list_processor.h" -#include "src/game/area.h" +#include "game/memory.h" +#include "game/object_helpers.h" +#include "game/obj_behaviors.h" +#include "game/object_list_processor.h" +#include "game/area.h" #include "pc/lua/smlua_hooks.h" #include "pc/debuglog.h" #include "pc/utils/misc.h" diff --git a/src/pc/network/packets/packet_spawn_objects.c b/src/pc/network/packets/packet_spawn_objects.c index 3978c327..f4846abe 100644 --- a/src/pc/network/packets/packet_spawn_objects.c +++ b/src/pc/network/packets/packet_spawn_objects.c @@ -2,8 +2,8 @@ #include "../network.h" #include "object_fields.h" #include "object_constants.h" -#include "src/game/object_helpers.h" -#include "src/game/area.h" +#include "game/object_helpers.h" +#include "game/area.h" #include "behavior_data.h" #include "behavior_table.h" #include "pc/lua/smlua.h" diff --git a/src/pc/network/packets/packet_spawn_star.c b/src/pc/network/packets/packet_spawn_star.c index 72fc4bb9..201fa63a 100644 --- a/src/pc/network/packets/packet_spawn_star.c +++ b/src/pc/network/packets/packet_spawn_star.c @@ -2,7 +2,7 @@ #include "../network.h" #include "object_fields.h" #include "behavior_data.h" -#include "src/game/behavior_actions.h" +#include "game/behavior_actions.h" #include "pc/lua/smlua_hooks.h" #include "pc/debuglog.h"