thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-04 15:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reset pause menu hidden on network shutdown (Oldest mistake in the book)

Browse source 
Also removed a couple unnecessary externs
This commit is contained in:
Agent X 2025-11-23 20:19:05 -05:00
parent bd5cf36c61
commit f6fc5c0aa7
5 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/dynos_warps.cpp
View file

@ -13,12 +13,9 @@ extern "C" {
#include "game/object_list_processor.h" #include "game/object_list_processor.h"
#include "pc/network/packets/packet.h" #include "pc/network/packets/packet.h"
#include "pc/lua/smlua_hooks.h" #include "pc/lua/smlua_hooks.h"
extern s8 gDialogBoxState;
extern s16 gMenuMode;
extern s32 gWdwWaterLevelSet; extern s32 gWdwWaterLevelSet;
extern u8 sSpawnTypeFromWarpBhv[]; extern u8 sSpawnTypeFromWarpBhv[];
extern void set_mario_initial_action(struct MarioState *, u32, u32); extern void set_mario_initial_action(struct MarioState *, u32, u32);
extern void set_play_mode(s16);
} }
// //

2
src/game/ingame_menu.h
View file

@ -134,6 +134,8 @@ extern u8 gDialogTextColorG;
extern u8 gDialogTextColorB; extern u8 gDialogTextColorB;
extern u8 gDialogTextColorA; extern u8 gDialogTextColorA;
extern bool gPauseMenuHidden;
extern s16 gMenuMode; extern s16 gMenuMode;
void create_dl_identity_matrix(void); void create_dl_identity_matrix(void);

1
src/game/level_update.h
View file

@ -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| */ /* |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); s16 level_trigger_warp(struct MarioState *m, s32 warpOp);
void level_set_transition(s16 length, void (*updateFunction)(s16 *)); void level_set_transition(s16 length, void (*updateFunction)(s16 *));
void set_play_mode(s16 playMode);
/* |description|Special warps to arg (`SPECIAL_WARP_*`)|descriptionEnd| */ /* |description|Special warps to arg (`SPECIAL_WARP_*`)|descriptionEnd| */
void warp_special(s32 arg); 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| */ /* |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| */

6
src/pc/lua/utils/smlua_misc_utils.c
View file

@ -130,7 +130,6 @@ bool djui_is_playerlist_ping_visible(void) {
/// ///
extern s8 gDialogBoxState;
s8 get_dialog_box_state(void) { s8 get_dialog_box_state(void) {
return gDialogBoxState; return gDialogBoxState;
} }
@ -295,12 +294,10 @@ void hud_set_flash(s8 value) {
/// ///
extern s16 gMenuMode;
bool is_game_paused(void) { bool is_game_paused(void) {
return gMenuMode != -1; return gMenuMode != -1;
} }
extern bool gPauseMenuHidden;
bool is_pause_menu_hidden(void) { bool is_pause_menu_hidden(void) {
return gPauseMenuHidden; return gPauseMenuHidden;
} }
@ -309,7 +306,6 @@ void set_pause_menu_hidden(bool hidden) {
gPauseMenuHidden = hidden; gPauseMenuHidden = hidden;
} }
extern void set_play_mode(s16);
void game_pause(void) { void game_pause(void) {
if (gMenuMode != -1) { return; } if (gMenuMode != -1) { return; }
@ -319,8 +315,6 @@ void game_pause(void) {
set_play_mode(PLAY_MODE_PAUSED); set_play_mode(PLAY_MODE_PAUSED);
} }
extern s8 gDialogBoxState;
extern s16 gPauseScreenMode;
void game_unpause(void) { void game_unpause(void) {
if (gMenuMode == -1) { return; } if (gMenuMode == -1) { return; }

2
src/pc/network/network.c
View file

@ -140,6 +140,8 @@ bool network_init(enum NetworkType inNetworkType, bool reconnecting) {
gNametagsSettings.showHealth = false; gNametagsSettings.showHealth = false;
gNametagsSettings.showSelfTag = false; gNametagsSettings.showSelfTag = false;
gPauseMenuHidden = false;
// initialize the network system // initialize the network system
gNetworkSentJoin = false; gNetworkSentJoin = false;
int rc = gNetworkSystem->initialize(inNetworkType, reconnecting); int rc = gNetworkSystem->initialize(inNetworkType, reconnecting);