diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2024-04-01 00:05:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-31 20:05:02 -0700 |
| commit | 997c45c2d2a2eebc71417d2d858b23038a3f666e (patch) | |
| tree | c371934677b1b4cd5ba711d3ba17ee22fb02b302 /src/code/z_play.c | |
| parent | 5bef89a6ff33c3e84ad58d201bd1996a0d9f7db4 (diff) | |
Introduce `z64pause_menu.h` header (#1505)
* z64pause_menu.h
* move functions and variables
* Move PauseMenuPage
* move stuff that seems public to the new header
* KALEIDO_OVL_MAX
* bss
* review
* IS_PAUSED
* format
* add argument to pause macros
* Update include/z64pause_menu.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* bss
* More IS_PAUSED I missed
* early returns
* bss
* empty commit to trigger GHA
* bss
* bss
* bss
* includes
* bss
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Diffstat (limited to 'src/code/z_play.c')
| -rw-r--r-- | src/code/z_play.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/code/z_play.c b/src/code/z_play.c index 56055fafb..70b241759 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -33,7 +33,6 @@ u8 sMotionBlurStatus; #include "overlays/gamestates/ovl_daytelop/z_daytelop.h" #include "overlays/gamestates/ovl_opening/z_opening.h" #include "overlays/gamestates/ovl_file_choose/z_file_select.h" -#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" #include "debug.h" s32 gDbgCamEnabled = false; @@ -973,7 +972,7 @@ void Play_UpdateMain(PlayState* this) { KaleidoSetup_Update(this); } - sp5C = (this->pauseCtx.state != 0) || (this->pauseCtx.debugEditor != DEBUG_EDITOR_NONE); + sp5C = IS_PAUSED(&this->pauseCtx); AnimationContext_Reset(&this->animationCtx); Object_UpdateEntries(&this->objectCtx); @@ -1015,7 +1014,7 @@ void Play_UpdateMain(PlayState* this) { Room_Noop(this, &this->roomCtx.prevRoom, &input[1], 1); Skybox_Update(&this->skyboxCtx); - if ((this->pauseCtx.state != 0) || (this->pauseCtx.debugEditor != DEBUG_EDITOR_NONE)) { + if (IS_PAUSED(&this->pauseCtx)) { KaleidoScopeCall_Update(this); } else if (this->gameOverCtx.state != GAMEOVER_INACTIVE) { GameOver_Update(this); @@ -1087,7 +1086,7 @@ void Play_Update(PlayState* this) { } void Play_PostWorldDraw(PlayState* this) { - if ((this->pauseCtx.state != 0) || (this->pauseCtx.debugEditor != DEBUG_EDITOR_NONE)) { + if (IS_PAUSED(&this->pauseCtx)) { KaleidoScopeCall_Draw(this); } @@ -1095,8 +1094,7 @@ void Play_PostWorldDraw(PlayState* this) { Interface_Draw(this); } - if (((this->pauseCtx.state == 0) && (this->pauseCtx.debugEditor == DEBUG_EDITOR_NONE)) || - (this->msgCtx.currentTextId != 0xFF)) { + if (!IS_PAUSED(&this->pauseCtx) || (this->msgCtx.currentTextId != 0xFF)) { Message_Draw(this); } |