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_lifemeter.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_lifemeter.c')
| -rw-r--r-- | src/code/z_lifemeter.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index d9abe151d..9f4f6c47e 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -1,6 +1,5 @@ #include "prevent_bss_reordering.h" #include "global.h" -#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" #include "interface/parameter_static/parameter_static.h" s16 sHeartsPrimColors[3][3] = { { 255, 70, 50 }, { 255, 190, 0 }, { 100, 100, 255 } }; @@ -406,8 +405,8 @@ void LifeMeter_UpdateSizeAndBeep(PlayState* play) { if (interfaceCtx->lifeSizeChange <= 0) { interfaceCtx->lifeSizeChange = 0; interfaceCtx->lifeSizeChangeDirection = 0; - if (!Player_InCsMode(play) && (play->pauseCtx.state == PAUSE_STATE_OFF) && - (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && LifeMeter_IsCritical() && !Play_InCsMode(play)) { + if (!Player_InCsMode(play) && !IS_PAUSED(&play->pauseCtx) && LifeMeter_IsCritical() && + !Play_InCsMode(play)) { Audio_PlaySfx(NA_SE_SY_HITPOINT_ALARM); } } |