Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorten include paths by removing unnecessary "src/"

This commit is contained in:
Agent X 2024-04-17 13:02:28 -04:00
parent 483028259c
commit a6b938df75
68 changed files with 189 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actors/error_model/geo.inc.c
View File

@ -1,5 +1,3 @@
#include "src/game/envfx_snow.h"
const GeoLayout error_model_geo[] = { const GeoLayout error_model_geo[] = {
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),

2
actors/waluigi/geo.inc.c
View File

@ -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[] = { 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_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),

2
data/dynos.c.h
View File

@ -5,7 +5,7 @@
#include "dynos.h" #include "dynos.h"
#include "types.h" #include "types.h"
#include "engine/behavior_script.h" #include "engine/behavior_script.h"
#include "src/game/moving_texture.h" #include "game/moving_texture.h"
void *dynos_swap_cmd(void *cmd); void *dynos_swap_cmd(void *cmd);

4
data/dynos.cpp.h
View File

@ -7,8 +7,8 @@
extern "C" { extern "C" {
#include "engine/behavior_script.h" #include "engine/behavior_script.h"
#include "engine/math_util.h" #include "engine/math_util.h"
#include "src/game/moving_texture.h" #include "game/moving_texture.h"
#include "src/pc/djui/djui_console.h" #include "pc/djui/djui_console.h"
} }
#define FUNCTION_CODE (u32) 0x434E5546 #define FUNCTION_CODE (u32) 0x434E5546

10
data/dynos_bin_behavior.cpp
View File

@ -9,11 +9,11 @@ extern "C" {
#include "include/model_ids.h" #include "include/model_ids.h"
#include "include/object_constants.h" #include "include/object_constants.h"
#include "include/object_fields.h" #include "include/object_fields.h"
#include "src/game/area.h" #include "game/area.h"
#include "src/game/object_list_processor.h" #include "game/object_list_processor.h"
#include "src/game/interaction.h" #include "game/interaction.h"
#include "src/pc/lua/utils/smlua_anim_utils.h" #include "pc/lua/utils/smlua_anim_utils.h"
#include "src/pc/lua/utils/smlua_collision_utils.h" #include "pc/lua/utils/smlua_collision_utils.h"
// Models and Animations // Models and Animations
#include "actors/common0.h" #include "actors/common0.h"

6
data/dynos_bin_geo.cpp
View File

@ -2,9 +2,9 @@
extern "C" { extern "C" {
#include "sm64.h" #include "sm64.h"
#include "geo_commands.h" #include "geo_commands.h"
#include "src/game/camera.h" #include "game/camera.h"
#include "src/game/envfx_snow.h" #include "game/envfx_snow.h"
#include "src/game/paintings.h" #include "game/paintings.h"
} }
#pragma GCC diagnostic push #pragma GCC diagnostic push

4
data/dynos_bin_lvl_validate.cpp
View File

@ -8,11 +8,11 @@ extern "C" {
#include "include/surface_terrains.h" #include "include/surface_terrains.h"
#include "include/seq_ids.h" #include "include/seq_ids.h"
#include "level_commands.h" #include "level_commands.h"
#include "src/game/level_update.h" #include "game/level_update.h"
#include "include/dialog_ids.h" #include "include/dialog_ids.h"
#include "levels/scripts.h" #include "levels/scripts.h"
#include "levels/menu/header.h" #include "levels/menu/header.h"
#include "src/game/area.h" #include "game/area.h"
} }
#define POINTER 0xD34DB33F #define POINTER 0xD34DB33F

2
data/dynos_bin_movtexqc.cpp
View File

@ -2,7 +2,7 @@
extern "C" { extern "C" {
#include "include/level_misc_macros.h" #include "include/level_misc_macros.h"
#include "src/game/moving_texture.h" #include "game/moving_texture.h"
} }
#pragma GCC diagnostic push #pragma GCC diagnostic push

2
data/dynos_c.cpp
View File

@ -1,6 +1,6 @@
#include "dynos.cpp.h" #include "dynos.cpp.h"
extern "C" { extern "C" {
#include "src/game/moving_texture.h" #include "game/moving_texture.h"
#include "game/hardcoded.h" #include "game/hardcoded.h"
void *dynos_swap_cmd(void *cmd) { void *dynos_swap_cmd(void *cmd) {

2
data/dynos_gfx_init.cpp
View File

@ -1,5 +1,5 @@
#include "dynos.cpp.h" #include "dynos.cpp.h"
#include "src/pc/loading.h" #include "pc/loading.h"
void DynOS_Gfx_GeneratePacks(const char* directory) { void DynOS_Gfx_GeneratePacks(const char* directory) {
snprintf(gCurrLoadingSegment.str, 256, "Generating DynOS Packs In Path:\n\\#808080\\%s", directory); snprintf(gCurrLoadingSegment.str, 256, "Generating DynOS Packs In Path:\n\\#808080\\%s", directory);

2
data/dynos_mgr_movtexqc.cpp
View File

@ -1,6 +1,6 @@
#include "dynos.cpp.h" #include "dynos.cpp.h"
extern "C" { extern "C" {
#include "src/game/area.h" #include "game/area.h"
} }
struct RegisteredMovtexQC { struct RegisteredMovtexQC {

2
docs/lua/examples/big-paddle/actors/big_paddle/geo.inc.c
View File

@ -1,4 +1,4 @@
#include "src/game/envfx_snow.h" #include "game/envfx_snow.h"
const GeoLayout big_paddle_geo[] = { const GeoLayout big_paddle_geo[] = {
GEO_NODE_START(), GEO_NODE_START(),

2
docs/lua/examples/custom-level/actors/big_paddle/geo.inc.c
View File

@ -1,4 +1,4 @@
#include "src/game/envfx_snow.h" #include "game/envfx_snow.h"
const GeoLayout big_paddle_geo[] = { const GeoLayout big_paddle_geo[] = {
GEO_NODE_START(), GEO_NODE_START(),

2
docs/lua/examples/custom-level/levels/bob/area_1/geo.inc.c
View File

@ -1,4 +1,4 @@
#include "src/game/envfx_snow.h" #include "game/envfx_snow.h"
const GeoLayout bob_area_1_geo[] = { const GeoLayout bob_area_1_geo[] = {
GEO_NODE_START(), GEO_NODE_START(),

2
include/level_commands.h
View File

@ -317,7 +317,7 @@
// README // // README //
/* When adding new level script commands, /* 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 */ LvlCmd_Init(), and specify which params are pointers */
// README // // README //

4
include/types.h
View File

@ -7,7 +7,7 @@
#include <ultra64.h> #include <ultra64.h>
#include "macros.h" #include "macros.h"
#include "pc/network/version.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 // Certain functions are marked as having return values, but do not
// actually return a value. This causes undefined behavior, which we'd rather // 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_NON_SYNC (1 << 2)
#define COOP_OBJ_FLAG_INITIALIZED (1 << 3) #define COOP_OBJ_FLAG_INITIALIZED (1 << 3)
#include "src/game/characters.h" #include "game/characters.h"
#include "data/dynos.c.h" #include "data/dynos.c.h"
#endif // _SM64_TYPES_H_ #endif // _SM64_TYPES_H_

2
src/game/behavior_actions.c
View File

@ -1,6 +1,6 @@
#include <PR/ultratypes.h> #include <PR/ultratypes.h>
#include "src/pc/network/network.h" #include "pc/network/network.h"
#include "types.h" #include "types.h"
#include "actors/common1.h" #include "actors/common1.h"
#include "actors/group12.h" #include "actors/group12.h"

2
src/game/behaviors/texscroll.inc.c
View File

@ -7,7 +7,7 @@
#include <math.h> #include <math.h>
#include "engine/math_util.h" #include "engine/math_util.h"
#include "src/game/scroll_targets.h" #include "game/scroll_targets.h"
#include "pc/pc_main.h" #include "pc/pc_main.h"
#include "pc/utils/misc.h" #include "pc/utils/misc.h"

2
src/game/behaviors/tree_particles.inc.c
View File

@ -1,6 +1,6 @@
// tree_particles.c.inc // tree_particles.c.inc
#include "src/game/envfx_snow.h" #include "game/envfx_snow.h"
void bhv_tree_snow_or_leaf_loop(void) { void bhv_tree_snow_or_leaf_loop(void) {
cur_obj_update_floor_height(); cur_obj_update_floor_height();

4
src/game/game_init.c
View File

@ -20,8 +20,8 @@
#include "segment2.h" #include "segment2.h"
#include "segment_symbols.h" #include "segment_symbols.h"
#include "rng_position.h" #include "rng_position.h"
#include "src/pc/djui/djui.h" #include "pc/djui/djui.h"
#include "src/pc/djui/djui_panel_pause.h" #include "pc/djui/djui_panel_pause.h"
#include "rumble_init.h" #include "rumble_init.h"
#include <prevent_bss_reordering.h> #include <prevent_bss_reordering.h>
#include "bettercamera.h" #include "bettercamera.h"

2
src/game/hardcoded.c
View File

@ -34,7 +34,7 @@
#include "levels/wf/header.h" #include "levels/wf/header.h"
#include "levels/wmotr/header.h" #include "levels/wmotr/header.h"
#include "src/pc/pc_main.h" #include "pc/pc_main.h"
extern Trajectory sThiHugeMetalBallTraj[]; extern Trajectory sThiHugeMetalBallTraj[];
extern Trajectory sThiTinyMetalBallTraj[]; extern Trajectory sThiTinyMetalBallTraj[];

2
src/game/ingame_menu.c
View File

@ -28,7 +28,7 @@
#include "hardcoded.h" #include "hardcoded.h"
#include "pc/network/network.h" #include "pc/network/network.h"
#include "pc/djui/djui.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 "pc/utils/misc.h"
#include "data/dynos_mgr_builtin_externs.h" #include "data/dynos_mgr_builtin_externs.h"
#include "hud.h" #include "hud.h"

2
src/game/macro_special_objects.c
View File

@ -10,7 +10,7 @@
#include "macro_presets.h" #include "macro_presets.h"
#include "special_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 * Converts the rotation value supplied by macro objects into one
* that can be used by in-game objects. * that can be used by in-game objects.

2
src/game/paintings.c
View File

@ -19,7 +19,7 @@
#include "pc/utils/misc.h" #include "pc/utils/misc.h"
#include "obj_behaviors.h" #include "obj_behaviors.h"
#include "level_update.h" #include "level_update.h"
#include "src/pc/network/network_player.h" #include "pc/network/network_player.h"
#include "print.h" #include "print.h"
#include "hardcoded.h" #include "hardcoded.h"

4
src/pc/controller/controller_keyboard.c
View File

@ -12,8 +12,8 @@
#include "pc/pc_main.h" #include "pc/pc_main.h"
#include "engine/math_util.h" #include "engine/math_util.h"
#include "menu/file_select.h" #include "menu/file_select.h"
#include "src/pc/djui/djui.h" #include "pc/djui/djui.h"
#include "src/pc/djui/djui_panel_pause.h" #include "pc/djui/djui_panel_pause.h"
static int keyboard_buttons_down; static int keyboard_buttons_down;

4
src/pc/crash_handler.c
View File

@ -21,8 +21,8 @@ char gLastRemoteBhv[256] = "";
#include "game/segment2.h" #include "game/segment2.h"
#include "game/mario.h" #include "game/mario.h"
#include "gfx_dimensions.h" #include "gfx_dimensions.h"
#include "src/pc/djui/djui.h" #include "pc/djui/djui.h"
#include "src/pc/djui/djui_unicode.h" #include "pc/djui/djui_unicode.h"
#include "pc/network/network.h" #include "pc/network/network.h"
#include "pc/gfx/gfx_rendering_api.h" #include "pc/gfx/gfx_rendering_api.h"
#include "pc/mods/mods.h" #include "pc/mods/mods.h"

4
src/pc/djui/djui_bind.c
View File

@ -1,8 +1,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "djui.h" #include "djui.h"
#include "src/pc/controller/controller_api.h" #include "pc/controller/controller_api.h"
#include "src/pc/controller/controller_bind_mapping.h" #include "pc/controller/controller_bind_mapping.h"
#include "sounds.h" #include "sounds.h"
#include "audio/external.h" #include "audio/external.h"

2
src/pc/djui/djui_bind.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "djui.h" #include "djui.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
struct DjuiBind { struct DjuiBind {
struct DjuiBase base; struct DjuiBase base;

4
src/pc/djui/djui_gfx.c
View File

@ -3,8 +3,8 @@
#include "djui.h" #include "djui.h"
#include "game/ingame_menu.h" #include "game/ingame_menu.h"
#include "game/segment2.h" #include "game/segment2.h"
#include "src/pc/pc_main.h" #include "pc/pc_main.h"
#include "src/pc/gfx/gfx_window_manager_api.h" #include "pc/gfx/gfx_window_manager_api.h"
#include "gfx_dimensions.h" #include "gfx_dimensions.h"
#include "djui_gfx.h" #include "djui_gfx.h"
#include "pc/debuglog.h" #include "pc/debuglog.h"

2
src/pc/djui/djui_image.c
View File

@ -1,6 +1,6 @@
#include "djui.h" #include "djui.h"
#include "game/segment2.h" #include "game/segment2.h"
#include "src/pc/network/network.h" #include "pc/network/network.h"
//////////////// ////////////////
// properties // // properties //

8
src/pc/djui/djui_interactable.c
View File

@ -5,10 +5,10 @@
#include "djui_panel_modlist.h" #include "djui_panel_modlist.h"
#include "djui_panel_playerlist.h" #include "djui_panel_playerlist.h"
#include "src/pc/controller/controller_sdl.h" #include "pc/controller/controller_sdl.h"
#include "src/pc/controller/controller_mouse.h" #include "pc/controller/controller_mouse.h"
#include "src/pc/controller/controller_keyboard.h" #include "pc/controller/controller_keyboard.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "pc/network/network.h" #include "pc/network/network.h"
#include "sounds.h" #include "sounds.h"

6
src/pc/djui/djui_panel.c
View File

@ -3,11 +3,11 @@
#include "djui_panel_main.h" #include "djui_panel_main.h"
#include "djui_panel_pause.h" #include "djui_panel_pause.h"
#include "djui_panel_join_message.h" #include "djui_panel_join_message.h"
#include "src/pc/debuglog.h" #include "pc/debuglog.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "sounds.h" #include "sounds.h"
#include "audio/external.h" #include "audio/external.h"
#include "src/game/bettercamera.h" #include "game/bettercamera.h"
static struct DjuiPanel* sPanelList = NULL; static struct DjuiPanel* sPanelList = NULL;
static struct DjuiPanel* sPanelRemoving = NULL; static struct DjuiPanel* sPanelRemoving = NULL;

6
src/pc/djui/djui_panel_camera.c
View File

@ -1,9 +1,9 @@
#include "djui.h" #include "djui.h"
#include "djui_panel.h" #include "djui_panel.h"
#include "djui_panel_menu.h" #include "djui_panel_menu.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
#include "src/game/bettercamera.h" #include "game/bettercamera.h"
void djui_panel_camera_value_changed(UNUSED struct DjuiBase* caller) { void djui_panel_camera_value_changed(UNUSED struct DjuiBase* caller) {
newcam_init_settings(); newcam_init_settings();

2
src/pc/djui/djui_panel_confirm.c
View File

@ -1,7 +1,7 @@
#include "djui.h" #include "djui.h"
#include "djui_panel.h" #include "djui_panel.h"
#include "djui_panel_menu.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*)) { 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); struct DjuiThreePanel* panel = djui_panel_menu_create(title);

8
src/pc/djui/djui_panel_controls.c
View File

@ -3,10 +3,10 @@
#include "djui_panel_menu.h" #include "djui_panel_menu.h"
#include "djui_panel_controls_n64.h" #include "djui_panel_controls_n64.h"
#include "djui_panel_controls_extra.h" #include "djui_panel_controls_extra.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
#include "src/pc/controller/controller_api.h" #include "pc/controller/controller_api.h"
#include "src/pc/controller/controller_sdl.h" #include "pc/controller/controller_sdl.h"
void djui_panel_controls_value_change(UNUSED struct DjuiBase* caller) { void djui_panel_controls_value_change(UNUSED struct DjuiBase* caller) {
controller_reconfigure(); controller_reconfigure();

2
src/pc/djui/djui_panel_controls_extra.c
View File

@ -1,7 +1,7 @@
#include "djui.h" #include "djui.h"
#include "djui_panel.h" #include "djui_panel.h"
#include "djui_panel_menu.h" #include "djui_panel_menu.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
void djui_panel_controls_extra_create(struct DjuiBase* caller) { void djui_panel_controls_extra_create(struct DjuiBase* caller) {
f32 bindBodyHeight = 28 * 12 + 1 * 10; f32 bindBodyHeight = 28 * 12 + 1 * 10;

2
src/pc/djui/djui_panel_controls_n64.c
View File

@ -1,7 +1,7 @@
#include "djui.h" #include "djui.h"
#include "djui_panel.h" #include "djui_panel.h"
#include "djui_panel_menu.h" #include "djui_panel_menu.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
void djui_panel_controls_n64_create(struct DjuiBase* caller) { void djui_panel_controls_n64_create(struct DjuiBase* caller) {
f32 bindBodyHeight = 28 * 14 + 1 * 13; f32 bindBodyHeight = 28 * 14 + 1 * 13;

12
src/pc/djui/djui_panel_join_lobbies.c
View File

@ -4,12 +4,12 @@
#include "djui_panel_menu.h" #include "djui_panel_menu.h"
#include "djui_panel_join_message.h" #include "djui_panel_join_message.h"
#include "djui_lobby_entry.h" #include "djui_lobby_entry.h"
#include "src/pc/network/network.h" #include "pc/network/network.h"
#include "src/pc/network/socket/socket.h" #include "pc/network/socket/socket.h"
#include "src/pc/network/coopnet/coopnet.h" #include "pc/network/coopnet/coopnet.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
#include "src/pc/debuglog.h" #include "pc/debuglog.h"
#include "macros.h" #include "macros.h"
#ifdef COOPNET #ifdef COOPNET

6
src/pc/djui/djui_panel_join_message.c
View File

@ -3,9 +3,9 @@
#include "djui_panel_menu.h" #include "djui_panel_menu.h"
#include "djui_panel_main.h" #include "djui_panel_main.h"
#include "djui_panel_join_message.h" #include "djui_panel_join_message.h"
#include "src/pc/network/network.h" #include "pc/network/network.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
#define DJUI_JOIN_MESSAGE_ELAPSE 60 #define DJUI_JOIN_MESSAGE_ELAPSE 60
bool gDjuiPanelJoinMessageVisible = false; bool gDjuiPanelJoinMessageVisible = false;

6
src/pc/djui/djui_panel_main.c
View File

@ -5,9 +5,9 @@
#include "djui_panel_options.h" #include "djui_panel_options.h"
#include "djui_panel_menu.h" #include "djui_panel_menu.h"
#include "djui_panel_confirm.h" #include "djui_panel_confirm.h"
#include "src/pc/controller/controller_sdl.h" #include "pc/controller/controller_sdl.h"
#include "src/pc/pc_main.h" #include "pc/pc_main.h"
#include "src/pc/update_checker.h" #include "pc/update_checker.h"
extern ALIGNED8 u8 texture_coopdx_logo[]; extern ALIGNED8 u8 texture_coopdx_logo[];

4
src/pc/djui/djui_panel_menu.c
View File

@ -1,8 +1,8 @@
#include "djui.h" #include "djui.h"
#include "djui_panel.h" #include "djui_panel.h"
#include "djui_unicode.h" #include "djui_unicode.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
#define RAINBOW_TEXT_LEN 255 #define RAINBOW_TEXT_LEN 255

6
src/pc/djui/djui_panel_menu_options.c
View File

@ -6,9 +6,9 @@
#include "djui_panel_options.h" #include "djui_panel_options.h"
#include "djui_panel_misc.h" #include "djui_panel_misc.h"
#include "djui_panel_pause.h" #include "djui_panel_pause.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
#include "src/game/level_update.h" #include "game/level_update.h"
static struct DjuiSelectionbox* sLevelBox = NULL; static struct DjuiSelectionbox* sLevelBox = NULL;
static struct DjuiCheckbox* sUseStageMusicCheckbox = NULL; static struct DjuiCheckbox* sUseStageMusicCheckbox = NULL;

4
src/pc/djui/djui_panel_sound.c
View File

@ -1,8 +1,8 @@
#include "djui.h" #include "djui.h"
#include "djui_panel.h" #include "djui_panel.h"
#include "djui_panel_menu.h" #include "djui_panel_menu.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/pc/configfile.h" #include "pc/configfile.h"
void djui_panel_sound_create(struct DjuiBase* caller) { void djui_panel_sound_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(SOUND, SOUND)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(SOUND, SOUND));

4
src/pc/djui/djui_root.c
View File

@ -1,6 +1,6 @@
#include "djui.h" #include "djui.h"
#include "src/pc/pc_main.h" #include "pc/pc_main.h"
#include "src/pc/gfx/gfx_window_manager_api.h" #include "pc/gfx/gfx_window_manager_api.h"
static bool djui_root_render(struct DjuiBase* base) { static bool djui_root_render(struct DjuiBase* base) {
// grab window height // grab window height

2
src/pc/gfx/gfx_direct3d11.cpp
View File

@ -23,7 +23,7 @@
#include "gfx_direct3d_common.h" #include "gfx_direct3d_common.h"
extern "C" { extern "C" {
#include "src/pc/controller/controller_bind_mapping.h" #include "pc/controller/controller_bind_mapping.h"
} }
#define DECLARE_GFX_DXGI_FUNCTIONS #define DECLARE_GFX_DXGI_FUNCTIONS

2
src/pc/gfx/gfx_dxgi.cpp
View File

@ -24,7 +24,7 @@
#include "gfx_dxgi.h" #include "gfx_dxgi.h"
extern "C" { extern "C" {
#include "src/pc/mods/mod_import.h" #include "pc/mods/mod_import.h"
#ifdef DISCORD_SDK #ifdef DISCORD_SDK
#include "pc/discord/discord.h" #include "pc/discord/discord.h"
#endif #endif

4
src/pc/gfx/gfx_sdl1.c
View File

@ -22,8 +22,8 @@
#include "../cliopts.h" #include "../cliopts.h"
#include "../platform.h" #include "../platform.h"
#include "src/pc/controller/controller_keyboard.h" #include "pc/controller/controller_keyboard.h"
#include "src/pc/controller/controller_bind_mapping.h" #include "pc/controller/controller_bind_mapping.h"
// TODO: figure out if this shit even works // TODO: figure out if this shit even works
#ifdef VERSION_EU #ifdef VERSION_EU

6
src/pc/gfx/gfx_sdl2.c
View File

@ -37,9 +37,9 @@
#include "../configfile.h" #include "../configfile.h"
#include "../cliopts.h" #include "../cliopts.h"
#include "src/pc/controller/controller_keyboard.h" #include "pc/controller/controller_keyboard.h"
#include "src/pc/controller/controller_sdl.h" #include "pc/controller/controller_sdl.h"
#include "src/pc/controller/controller_bind_mapping.h" #include "pc/controller/controller_bind_mapping.h"
#include "pc/utils/misc.h" #include "pc/utils/misc.h"
#include "pc/mods/mod_import.h" #include "pc/mods/mod_import.h"
#include "pc/rom_checker.h" #include "pc/rom_checker.h"

40
src/pc/lua/smlua_cobject_autogen.c
View File

@ -2,26 +2,26 @@
/* SHOULD NOT BE MANUALLY CHANGED */ /* SHOULD NOT BE MANUALLY CHANGED */
#include "smlua.h" #include "smlua.h"
#include "include/types.h" #include "include/types.h"
#include "src/game/area.h" #include "game/area.h"
#include "src/game/camera.h" #include "game/camera.h"
#include "src/game/characters.h" #include "game/characters.h"
#include "src/engine/surface_collision.h" #include "engine/surface_collision.h"
#include "src/pc/network/network_player.h" #include "pc/network/network_player.h"
#include "src/pc/djui/djui_hud_utils.h" #include "pc/djui/djui_hud_utils.h"
#include "src/game/object_helpers.h" #include "game/object_helpers.h"
#include "src/game/mario_step.h" #include "game/mario_step.h"
#include "src/pc/lua/utils/smlua_anim_utils.h" #include "pc/lua/utils/smlua_anim_utils.h"
#include "src/pc/lua/utils/smlua_misc_utils.h" #include "pc/lua/utils/smlua_misc_utils.h"
#include "src/pc/lua/utils/smlua_collision_utils.h" #include "pc/lua/utils/smlua_collision_utils.h"
#include "src/pc/lua/utils/smlua_level_utils.h" #include "pc/lua/utils/smlua_level_utils.h"
#include "src/game/spawn_sound.h" #include "game/spawn_sound.h"
#include "src/pc/network/network.h" #include "pc/network/network.h"
#include "src/game/hardcoded.h" #include "game/hardcoded.h"
#include "src/pc/mods/mod.h" #include "pc/mods/mod.h"
#include "src/pc/lua/utils/smlua_audio_utils.h" #include "pc/lua/utils/smlua_audio_utils.h"
#include "src/game/paintings.h" #include "game/paintings.h"
#include "src/pc/djui/djui_types.h" #include "pc/djui/djui_types.h"
#include "src/game/first_person_cam.h" #include "game/first_person_cam.h"
#include "include/object_fields.h" #include "include/object_fields.h"

78
src/pc/lua/smlua_functions_autogen.c
View File

@ -3,46 +3,46 @@
#include "smlua.h" #include "smlua.h"
#include "src/audio/external.h" #include "audio/external.h"
#include "src/engine/math_util.h" #include "engine/math_util.h"
#include "src/engine/surface_collision.h" #include "engine/surface_collision.h"
#include "src/engine/surface_load.h" #include "engine/surface_load.h"
#include "src/game/camera.h" #include "game/camera.h"
#include "src/game/characters.h" #include "game/characters.h"
#include "src/game/mario_step.h" #include "game/mario_step.h"
#include "src/game/mario.h" #include "game/mario.h"
#include "src/pc/djui/djui_popup.h" #include "pc/djui/djui_popup.h"
#include "src/pc/network/network_utils.h" #include "pc/network/network_utils.h"
#include "src/pc/djui/djui_console.h" #include "pc/djui/djui_console.h"
#include "src/pc/djui/djui_chat_message.h" #include "pc/djui/djui_chat_message.h"
#include "src/game/interaction.h" #include "game/interaction.h"
#include "src/game/level_info.h" #include "game/level_info.h"
#include "src/game/save_file.h" #include "game/save_file.h"
#include "src/game/sound_init.h" #include "game/sound_init.h"
#include "src/pc/djui/djui_hud_utils.h" #include "pc/djui/djui_hud_utils.h"
#include "src/pc/network/network_player.h" #include "pc/network/network_player.h"
#include "src/pc/network/lag_compensation.h" #include "pc/network/lag_compensation.h"
#include "include/behavior_table.h" #include "include/behavior_table.h"
#include "src/pc/lua/utils/smlua_obj_utils.h" #include "pc/lua/utils/smlua_obj_utils.h"
#include "src/pc/lua/utils/smlua_misc_utils.h" #include "pc/lua/utils/smlua_misc_utils.h"
#include "src/pc/lua/utils/smlua_collision_utils.h" #include "pc/lua/utils/smlua_collision_utils.h"
#include "src/pc/lua/utils/smlua_math_utils.h" #include "pc/lua/utils/smlua_math_utils.h"
#include "src/pc/lua/utils/smlua_model_utils.h" #include "pc/lua/utils/smlua_model_utils.h"
#include "src/pc/lua/utils/smlua_text_utils.h" #include "pc/lua/utils/smlua_text_utils.h"
#include "src/pc/lua/utils/smlua_audio_utils.h" #include "pc/lua/utils/smlua_audio_utils.h"
#include "src/pc/lua/utils/smlua_level_utils.h" #include "pc/lua/utils/smlua_level_utils.h"
#include "src/pc/lua/utils/smlua_anim_utils.h" #include "pc/lua/utils/smlua_anim_utils.h"
#include "src/pc/lua/utils/smlua_deprecated.h" #include "pc/lua/utils/smlua_deprecated.h"
#include "src/game/object_list_processor.h" #include "game/object_list_processor.h"
#include "src/game/behavior_actions.h" #include "game/behavior_actions.h"
#include "src/game/mario_misc.h" #include "game/mario_misc.h"
#include "src/pc/mods/mod_storage.h" #include "pc/mods/mod_storage.h"
#include "src/pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/game/level_update.h" #include "game/level_update.h"
#include "src/game/area.h" #include "game/area.h"
#include "src/engine/level_script.h" #include "engine/level_script.h"
#include "src/game/ingame_menu.h" #include "game/ingame_menu.h"
#include "src/game/first_person_cam.h" #include "game/first_person_cam.h"
//////////// ////////////

4
src/pc/lua/smlua_hooks.c
View File

@ -5,10 +5,10 @@
#include "sm64.h" #include "sm64.h"
#include "behavior_commands.h" #include "behavior_commands.h"
#include "pc/mods/mod.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/djui/djui_chat_message.h"
#include "pc/crash_handler.h" #include "pc/crash_handler.h"
#include "src/game/hud.h" #include "game/hud.h"
#include "pc/debug_context.h" #include "pc/debug_context.h"
#include "pc/network/network.h" #include "pc/network/network.h"
#include "pc/network/network_player.h" #include "pc/network/network_player.h"

2
src/pc/lua/smlua_utils.c
View File

@ -1,5 +1,5 @@
#include "smlua.h" #include "smlua.h"
#include "src/pc/mods/mods.h" #include "pc/mods/mods.h"
#include "audio/external.h" #include "audio/external.h"
u8 gSmLuaConvertSuccess = false; u8 gSmLuaConvertSuccess = false;

2
src/pc/lua/utils/smlua_collision_utils.c
View File

@ -1,6 +1,6 @@
#include "types.h" #include "types.h"
#include "src/engine/surface_collision.h" #include "engine/surface_collision.h"
#include "include/surface_terrains.h" #include "include/surface_terrains.h"
#include "game/mario_step.h" #include "game/mario_step.h"

6
src/pc/lua/utils/smlua_model_utils.c
View File

@ -2,9 +2,9 @@
#include "types.h" #include "types.h"
#include "geo_commands.h" #include "geo_commands.h"
#include "src/game/area.h" #include "game/area.h"
#include "src/engine/graph_node.h" #include "engine/graph_node.h"
#include "src/engine/level_script.h" #include "engine/level_script.h"
// models // models
#include "actors/common0.h" #include "actors/common0.h"

2
src/pc/lua/utils/smlua_model_utils.h
View File

@ -1,7 +1,7 @@
#ifndef SMLUA_MODEL_UTILS_H #ifndef SMLUA_MODEL_UTILS_H
#define SMLUA_MODEL_UTILS_H #define SMLUA_MODEL_UTILS_H
#include "src/game/memory.h" #include "game/memory.h"
enum ModelExtendedId { enum ModelExtendedId {
E_MODEL_NONE, E_MODEL_NONE,

4
src/pc/lua/utils/smlua_obj_utils.c
View File

@ -1,8 +1,8 @@
#include "types.h" #include "types.h"
#include "object_constants.h" #include "object_constants.h"
#include "object_fields.h" #include "object_fields.h"
#include "src/game/object_helpers.h" #include "game/object_helpers.h"
#include "src/game/interaction.h" #include "game/interaction.h"
#include "engine/math_util.h" #include "engine/math_util.h"
#include "pc/lua/smlua.h" #include "pc/lua/smlua.h"

2
src/pc/mods/mod.h
View File

@ -3,7 +3,7 @@
#include "PR/ultratypes.h" #include "PR/ultratypes.h"
#include <types.h> #include <types.h>
#include "src/pc/platform.h" #include "pc/platform.h"
#define MOD_NAME_MAX_LENGTH 64 #define MOD_NAME_MAX_LENGTH 64
#define MOD_INCOMPATIBLE_MAX_LENGTH 256 #define MOD_INCOMPATIBLE_MAX_LENGTH 256

2
src/pc/mods/mods.h
View File

@ -3,7 +3,7 @@
#include "PR/ultratypes.h" #include "PR/ultratypes.h"
#include <types.h> #include <types.h>
#include "src/pc/platform.h" #include "pc/platform.h"
#include "mod.h" #include "mod.h"
#define MAX_MOD_SIZE (35 * 1048576) // 35MB #define MAX_MOD_SIZE (35 * 1048576) // 35MB

2
src/pc/mods/mods_utils.h
View File

@ -3,7 +3,7 @@
#include "PR/ultratypes.h" #include "PR/ultratypes.h"
#include <types.h> #include <types.h>
#include "src/pc/platform.h" #include "pc/platform.h"
void mods_size_enforce(struct Mods* mods); void mods_size_enforce(struct Mods* mods);
void mods_update_selectable(void); void mods_update_selectable(void);

6
src/pc/network/network.c
View File

@ -6,8 +6,8 @@
#include "game/level_update.h" #include "game/level_update.h"
#include "object_constants.h" #include "object_constants.h"
#include "behavior_table.h" #include "behavior_table.h"
#include "src/game/hardcoded.h" #include "game/hardcoded.h"
#include "src/game/scroll_targets.h" #include "game/scroll_targets.h"
#include "pc/configfile.h" #include "pc/configfile.h"
#include "pc/djui/djui.h" #include "pc/djui/djui.h"
#include "pc/djui/djui_panel.h" #include "pc/djui/djui_panel.h"
@ -37,7 +37,7 @@
// fix warnings when including rendering_graph_node // fix warnings when including rendering_graph_node
#undef near #undef near
#undef far #undef far
#include "src/game/rendering_graph_node.h" #include "game/rendering_graph_node.h"
// Mario 64 specific externs // Mario 64 specific externs
extern s16 sCurrPlayMode; extern s16 sCurrPlayMode;

10
src/pc/network/packets/packet_collect_coin.c
View File

@ -4,11 +4,11 @@
#include "object_constants.h" #include "object_constants.h"
#include "behavior_table.h" #include "behavior_table.h"
#include "course_table.h" #include "course_table.h"
#include "src/game/hardcoded.h" #include "game/hardcoded.h"
#include "src/game/interaction.h" #include "game/interaction.h"
#include "src/engine/math_util.h" #include "engine/math_util.h"
#include "src/game/memory.h" #include "game/memory.h"
#include "src/game/object_helpers.h" #include "game/object_helpers.h"
#include "pc/lua/smlua_hooks.h" #include "pc/lua/smlua_hooks.h"
#include "pc/debuglog.h" #include "pc/debuglog.h"

8
src/pc/network/packets/packet_collect_item.c
View File

@ -4,10 +4,10 @@
#include "object_constants.h" #include "object_constants.h"
#include "behavior_table.h" #include "behavior_table.h"
#include "course_table.h" #include "course_table.h"
#include "src/game/interaction.h" #include "game/interaction.h"
#include "src/engine/math_util.h" #include "engine/math_util.h"
#include "src/game/memory.h" #include "game/memory.h"
#include "src/game/object_helpers.h" #include "game/object_helpers.h"
#include "pc/lua/smlua_hooks.h" #include "pc/lua/smlua_hooks.h"
static f32 dist_to_pos(struct Object* o, f32* pos) { static f32 dist_to_pos(struct Object* o, f32* pos) {

6
src/pc/network/packets/packet_collect_star.c
View File

@ -5,9 +5,9 @@
#include "object_fields.h" #include "object_fields.h"
#include "object_constants.h" #include "object_constants.h"
#include "game/interaction.h" #include "game/interaction.h"
#include "src/game/memory.h" #include "game/memory.h"
#include "src/game/object_helpers.h" #include "game/object_helpers.h"
#include "src/game/save_file.h" #include "game/save_file.h"
#include "pc/lua/smlua_hooks.h" #include "pc/lua/smlua_hooks.h"
#include "pc/debuglog.h" #include "pc/debuglog.h"

12
src/pc/network/packets/packet_join.c
View File

@ -4,12 +4,12 @@
#include "object_constants.h" #include "object_constants.h"
#include "behavior_table.h" #include "behavior_table.h"
#include "course_table.h" #include "course_table.h"
#include "src/game/interaction.h" #include "game/interaction.h"
#include "src/engine/math_util.h" #include "engine/math_util.h"
#include "src/game/save_file.h" #include "game/save_file.h"
#include "src/game/level_update.h" #include "game/level_update.h"
#include "src/game/hardcoded.h" #include "game/hardcoded.h"
#include "src/pc/fs/fs.h" #include "pc/fs/fs.h"
#include "PR/os_eeprom.h" #include "PR/os_eeprom.h"
#include "pc/network/version.h" #include "pc/network/version.h"
#include "pc/djui/djui.h" #include "pc/djui/djui.h"

2
src/pc/network/packets/packet_network_players.c
View File

@ -2,7 +2,7 @@
#include "../network.h" #include "../network.h"
#include "object_fields.h" #include "object_fields.h"
#include "behavior_data.h" #include "behavior_data.h"
#include "src/game/behavior_actions.h" #include "game/behavior_actions.h"
#include "pc/debuglog.h" #include "pc/debuglog.h"
#include "pc/configfile.h" #include "pc/configfile.h"
#include "pc/network/moderator_list.h" #include "pc/network/moderator_list.h"

10
src/pc/network/packets/packet_object.c
View File

@ -5,11 +5,11 @@
#include "object_constants.h" #include "object_constants.h"
#include "behavior_data.h" #include "behavior_data.h"
#include "behavior_table.h" #include "behavior_table.h"
#include "src/game/memory.h" #include "game/memory.h"
#include "src/game/object_helpers.h" #include "game/object_helpers.h"
#include "src/game/obj_behaviors.h" #include "game/obj_behaviors.h"
#include "src/game/object_list_processor.h" #include "game/object_list_processor.h"
#include "src/game/area.h" #include "game/area.h"
#include "pc/lua/smlua_hooks.h" #include "pc/lua/smlua_hooks.h"
#include "pc/debuglog.h" #include "pc/debuglog.h"
#include "pc/utils/misc.h" #include "pc/utils/misc.h"

4
src/pc/network/packets/packet_spawn_objects.c
View File

@ -2,8 +2,8 @@
#include "../network.h" #include "../network.h"
#include "object_fields.h" #include "object_fields.h"
#include "object_constants.h" #include "object_constants.h"
#include "src/game/object_helpers.h" #include "game/object_helpers.h"
#include "src/game/area.h" #include "game/area.h"
#include "behavior_data.h" #include "behavior_data.h"
#include "behavior_table.h" #include "behavior_table.h"
#include "pc/lua/smlua.h" #include "pc/lua/smlua.h"

2
src/pc/network/packets/packet_spawn_star.c
View File

@ -2,7 +2,7 @@
#include "../network.h" #include "../network.h"
#include "object_fields.h" #include "object_fields.h"
#include "behavior_data.h" #include "behavior_data.h"
#include "src/game/behavior_actions.h" #include "game/behavior_actions.h"
#include "pc/lua/smlua_hooks.h" #include "pc/lua/smlua_hooks.h"
#include "pc/debuglog.h" #include "pc/debuglog.h"