diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-03-29 18:04:41 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 22:04:41 +0100 |
| commit | 72bae2b6ba70c6631e2f68c92bab369f7d6bf829 (patch) | |
| tree | c4b7cb65c9ee359205b5674b8e8871c3167fef85 /src/code/z_lifemeter.c | |
| parent | 8c7d8359fa1eaf858cd59111c0f7075b30f544d6 (diff) | |
`z_kaleido_setup` (#768)
* KaleidoSetup_Init
* func_800F4C0C
* func_800F4A10 NON_EQUIVALENT
* fixes
* func_800F4A10
* import data
* Rename Play_InCsMode
* Name KaleidoSetup_Update
* minor cleanup
* Update src/code/z_play.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c
* unname D_801BDB00
* format
* a
* actorfixer
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@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 d89b427e9..73ba326b5 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -399,9 +399,8 @@ void LifeMeter_UpdateSizeAndBeep(GlobalContext* globalCtx) { if (interfaceCtx->lifeSizeChange <= 0) { interfaceCtx->lifeSizeChange = 0; interfaceCtx->lifeSizeChangeDirection = 0; - if (Player_InCsMode(&globalCtx->state) == 0 && (globalCtx->pauseCtx.state == 0) && - (globalCtx->pauseCtx.debugState == 0) && LifeMeter_IsCritical() && func_801690CC(globalCtx) == 0) { - // Player_InCsMode and func_801690CC : Check if in Cutscene + if (!Player_InCsMode(&globalCtx->state) && (globalCtx->pauseCtx.state == 0) && + (globalCtx->pauseCtx.debugState == 0) && LifeMeter_IsCritical() && !Play_InCsMode(globalCtx)) { play_sound(NA_SE_SY_HITPOINT_ALARM); } } |