diff options
| author | fig02 <fig02srl@gmail.com> | 2022-07-30 17:28:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 17:28:50 -0400 |
| commit | afbc312024100187fa1169ca32723acd338ea85a (patch) | |
| tree | 026ecebc8f9cbd0c67fbacd7f465408e2ec15ffc /src/code/z_parameter.c | |
| parent | d7ea63c75d7ea4979040210b19d840f01a7477d2 (diff) | |
Rename "Scene Setup Index" to "Scene Layer" (#1300)
* setup -> layer
* IS_CUTSCENE_LAYER
* review
* backtick
* remove some more mentions of setup
* alt header block
* clarifying comment
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 30d3348d4..5eb16c94d 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2439,7 +2439,7 @@ void Magic_Update(PlayState* play) { // Add magic until magicFillTarget is reached gSaveContext.magic += 4; - if (gSaveContext.gameMode == GAMEMODE_NORMAL && gSaveContext.sceneSetupIndex < 4) { + if (gSaveContext.gameMode == GAMEMODE_NORMAL && !IS_CUTSCENE_LAYER) { Audio_PlaySfxGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } @@ -3889,8 +3889,8 @@ void Interface_Update(PlayState* play) { } if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0)) { - if ((gSaveContext.minigameState == 1) || (gSaveContext.sceneSetupIndex < 4) || - ((play->sceneNum == SCENE_SPOT20) && (gSaveContext.sceneSetupIndex == 4))) { + if ((gSaveContext.minigameState == 1) || !IS_CUTSCENE_LAYER || + ((play->sceneNum == SCENE_SPOT20) && (gSaveContext.sceneLayer == 4))) { if ((msgCtx->msgMode == MSGMODE_NONE) || ((msgCtx->msgMode != MSGMODE_NONE) && (play->sceneNum == SCENE_BOWLING))) { if (play->gameOverCtx.state == GAMEOVER_INACTIVE) { |