diff --git a/data/dynos_warps.cpp b/data/dynos_warps.cpp index 4e7fd725f..edeb08b1a 100644 --- a/data/dynos_warps.cpp +++ b/data/dynos_warps.cpp @@ -13,12 +13,9 @@ extern "C" { #include "game/object_list_processor.h" #include "pc/network/packets/packet.h" #include "pc/lua/smlua_hooks.h" -extern s8 gDialogBoxState; -extern s16 gMenuMode; extern s32 gWdwWaterLevelSet; extern u8 sSpawnTypeFromWarpBhv[]; extern void set_mario_initial_action(struct MarioState *, u32, u32); -extern void set_play_mode(s16); } // diff --git a/src/game/ingame_menu.h b/src/game/ingame_menu.h index e2ed324df..5ea2c4f87 100644 --- a/src/game/ingame_menu.h +++ b/src/game/ingame_menu.h @@ -134,6 +134,8 @@ extern u8 gDialogTextColorG; extern u8 gDialogTextColorB; extern u8 gDialogTextColorA; +extern bool gPauseMenuHidden; + extern s16 gMenuMode; void create_dl_identity_matrix(void); diff --git a/src/game/level_update.h b/src/game/level_update.h index 5ffd5d242..704924a01 100644 --- a/src/game/level_update.h +++ b/src/game/level_update.h @@ -193,6 +193,7 @@ void initiate_painting_warp(s16 paintingIndex); /* |description|Triggers a warp (WARP_OP_*) for the level. Pass in `gMarioStates[0]` for `m`|descriptionEnd| */ s16 level_trigger_warp(struct MarioState *m, s32 warpOp); void level_set_transition(s16 length, void (*updateFunction)(s16 *)); +void set_play_mode(s16 playMode); /* |description|Special warps to arg (`SPECIAL_WARP_*`)|descriptionEnd| */ void warp_special(s32 arg); /* |description|Initiates a warp to `destLevel` in `destArea` at `destWarpNode` with `arg`. This function is unstable and it's generally recommended to use `warp_to_level` instead|descriptionEnd| */ diff --git a/src/pc/lua/utils/smlua_misc_utils.c b/src/pc/lua/utils/smlua_misc_utils.c index 37ab42d83..f255dacee 100644 --- a/src/pc/lua/utils/smlua_misc_utils.c +++ b/src/pc/lua/utils/smlua_misc_utils.c @@ -130,7 +130,6 @@ bool djui_is_playerlist_ping_visible(void) { /// -extern s8 gDialogBoxState; s8 get_dialog_box_state(void) { return gDialogBoxState; } @@ -295,12 +294,10 @@ void hud_set_flash(s8 value) { /// -extern s16 gMenuMode; bool is_game_paused(void) { return gMenuMode != -1; } -extern bool gPauseMenuHidden; bool is_pause_menu_hidden(void) { return gPauseMenuHidden; } @@ -309,7 +306,6 @@ void set_pause_menu_hidden(bool hidden) { gPauseMenuHidden = hidden; } -extern void set_play_mode(s16); void game_pause(void) { if (gMenuMode != -1) { return; } @@ -319,8 +315,6 @@ void game_pause(void) { set_play_mode(PLAY_MODE_PAUSED); } -extern s8 gDialogBoxState; -extern s16 gPauseScreenMode; void game_unpause(void) { if (gMenuMode == -1) { return; } diff --git a/src/pc/network/network.c b/src/pc/network/network.c index 320f5d62c..d267d7cb8 100644 --- a/src/pc/network/network.c +++ b/src/pc/network/network.c @@ -140,6 +140,8 @@ bool network_init(enum NetworkType inNetworkType, bool reconnecting) { gNametagsSettings.showHealth = false; gNametagsSettings.showSelfTag = false; + gPauseMenuHidden = false; + // initialize the network system gNetworkSentJoin = false; int rc = gNetworkSystem->initialize(inNetworkType, reconnecting);