diff options
| author | Adam Bird <Archez@users.noreply.github.com> | 2023-08-30 13:04:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-30 17:04:21 +0000 |
| commit | f6c6bd0bec3aba7491781b0e48ee01980dd2893f (patch) | |
| tree | d8dca0de3bf772900efeddc7be19577cf6d1a977 /soh/src/code | |
| parent | 4aadf4c14c2c2605c69a54b45c92326c729b1b7b (diff) | |
Fix: Check for debug mode when watching cutscene debug inputs (#3133)
* fix check for debug mode when watching cutscene debug inputs
* update other cvar to debug enabled
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_camera.c | 3 | ||||
| -rw-r--r-- | soh/src/code/z_demo.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 325eca828..5d30771fb 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -7701,7 +7701,8 @@ Vec3s Camera_Update(Camera* camera) { BINANG_TO_DEGF(camera->camDir.x), camera->camDir.y, BINANG_TO_DEGF(camera->camDir.y)); } - if (camera->timer != -1 && CHECK_BTN_ALL(D_8015BD7C->state.input[0].press.button, BTN_DRIGHT) && CVarGetInteger("gDebugCamera", 0)) { + if (camera->timer != -1 && CHECK_BTN_ALL(D_8015BD7C->state.input[0].press.button, BTN_DRIGHT) && + CVarGetInteger("gDebugEnabled", 0)) { camera->timer = 0; } diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index cee86e165..3faa173a9 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -154,15 +154,15 @@ void func_80064558(PlayState* play, CutsceneContext* csCtx) { void func_800645A0(PlayState* play, CutsceneContext* csCtx) { Input* input = &play->state.input[0]; - if (CHECK_BTN_ALL(input->press.button, BTN_DLEFT) && (csCtx->state == CS_STATE_IDLE) && - (gSaveContext.sceneSetupIndex >= 4)) { + if (CVarGetInteger("gDebugEnabled", 0) && CHECK_BTN_ALL(input->press.button, BTN_DLEFT) && + (csCtx->state == CS_STATE_IDLE) && (gSaveContext.sceneSetupIndex >= 4)) { D_8015FCC8 = 0; gSaveContext.cutsceneIndex = 0xFFFD; gSaveContext.cutsceneTrigger = 1; } - if (CHECK_BTN_ALL(input->press.button, BTN_DUP) && (csCtx->state == CS_STATE_IDLE) && - (gSaveContext.sceneSetupIndex >= 4) && !gDbgCamEnabled) { + if (CVarGetInteger("gDebugEnabled", 0) && CHECK_BTN_ALL(input->press.button, BTN_DUP) && + (csCtx->state == CS_STATE_IDLE) && (gSaveContext.sceneSetupIndex >= 4) && !gDbgCamEnabled) { D_8015FCC8 = 1; gSaveContext.cutsceneIndex = 0xFFFD; gSaveContext.cutsceneTrigger = 1; |