thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made the 'R Button - Options' text only appear on pause

Browse source
This commit is contained in:
MysterD 2021-08-01 13:26:57 -07:00
parent 3085b9b749
commit a2bb578dbf
4 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game/level_update.c
View file

@ -219,13 +219,6 @@ u32 pressed_pause(void) {
}
void set_play_mode(s16 playMode) {
if (sCurrPlayMode == PLAY_MODE_PAUSED && playMode != PLAY_MODE_PAUSED) {
djui_base_set_visible(&gDjuiPauseOptions->base, false);
}
if (playMode == PLAY_MODE_PAUSED && sCurrPlayMode != PLAY_MODE_PAUSED) {
djui_base_set_visible(&gDjuiPauseOptions->base, true);
}
sCurrPlayMode = playMode;
D_80339ECA = 0;
}

18
src/pc/djui/djui.c
View file

@ -1,22 +1,23 @@
#include "djui.h"
#include "../debuglog.h"
#include "pc/cliopts.h"
#include "game/level_update.h"
static Gfx* sSavedDisplayListHead = NULL;
struct DjuiRoot* gDjuiRoot = NULL;
struct DjuiText* gDjuiPauseOptions = NULL;
static struct DjuiText* sDjuiPauseOptions = NULL;
void djui_init(void) {
gDjuiRoot = djui_root_create();
gDjuiPauseOptions = djui_text_create(&gDjuiRoot->base, "R Button - Options");
djui_base_set_size_type(&gDjuiPauseOptions->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&gDjuiPauseOptions->base, 1.0f, 32);
djui_base_set_location(&gDjuiPauseOptions->base, 0, 16);
djui_text_set_drop_shadow(gDjuiPauseOptions, 0, 0, 0, 255);
djui_text_set_alignment(gDjuiPauseOptions, DJUI_HALIGN_CENTER, DJUI_VALIGN_CENTER);
djui_base_set_visible(&gDjuiPauseOptions->base, false);
sDjuiPauseOptions = djui_text_create(&gDjuiRoot->base, "R Button - Options");
djui_base_set_size_type(&sDjuiPauseOptions->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&sDjuiPauseOptions->base, 1.0f, 32);
djui_base_set_location(&sDjuiPauseOptions->base, 0, 16);
djui_text_set_drop_shadow(sDjuiPauseOptions, 0, 0, 0, 255);
djui_text_set_alignment(sDjuiPauseOptions, DJUI_HALIGN_CENTER, DJUI_VALIGN_CENTER);
djui_base_set_visible(&sDjuiPauseOptions->base, false);
if (gCLIOpts.Network != NT_SERVER) {
djui_panel_main_create(NULL);
@ -48,6 +49,7 @@ void djui_render(void) {
djui_panel_update();
djui_popup_update();
djui_base_set_visible(&sDjuiPauseOptions->base, (sCurrPlayMode == PLAY_MODE_PAUSED));
djui_base_render(&gDjuiRoot->base);
djui_cursor_update();

1
src/pc/djui/djui.h
View file

@ -50,7 +50,6 @@
#include "djui_panel_cheats.h"
extern struct DjuiRoot* gDjuiRoot;
extern struct DjuiText* gDjuiPauseOptions;
void djui_init(void);
void djui_connect_menu_open(void);

1
src/pc/djui/djui_panel_pause.c
View file

@ -57,5 +57,4 @@ void djui_panel_pause_create(struct DjuiBase* caller) {
djui_panel_add(caller, &panel->base, defaultBase);
gInteractableOverridePad = true;
gDjuiPanelPauseCreated = true;
djui_base_set_visible(&gDjuiPauseOptions->base, false);
}