diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-04-22 05:54:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 15:54:47 -0400 |
| commit | 24454b2277713ece47510936ed84ffad715795c5 (patch) | |
| tree | 0c56596c478bb7f2dd99582668549abd83aa6d3e /src/code | |
| parent | 40846f3d3ac0f4f7cbc1b828b4f70a935f6aeacd (diff) | |
cs state cleanup (#1229)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_800E8EA0.c | 8 | ||||
| -rw-r--r-- | src/code/z_parameter.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/code/code_800E8EA0.c b/src/code/code_800E8EA0.c index 93970cc6a..4ab38fcba 100644 --- a/src/code/code_800E8EA0.c +++ b/src/code/code_800E8EA0.c @@ -85,7 +85,7 @@ s32 Actor_TrackPlayerSetFocusHeight(PlayState* play, Actor* actor, Vec3s* headRo actor->focus.pos = actor->world.pos; actor->focus.pos.y += focusHeight; - if (!((play->csCtx.state != 0) || gDbgCamEnabled)) { + if (!((play->csCtx.state != CS_STATE_IDLE) || gDbgCamEnabled)) { yaw = ABS_ALT(BINANG_SUB(actor->yawTowardsPlayer, actor->shape.rot.y)); if (yaw >= 0x4300) { Actor_TrackNone(headRot, torsoRot); @@ -93,7 +93,7 @@ s32 Actor_TrackPlayerSetFocusHeight(PlayState* play, Actor* actor, Vec3s* headRo } } - if ((play->csCtx.state != 0) || gDbgCamEnabled) { + if ((play->csCtx.state != CS_STATE_IDLE) || gDbgCamEnabled) { target = play->view.eye; } else { target = player->actor.focus.pos; @@ -127,7 +127,7 @@ s32 Actor_TrackPlayer(PlayState* play, Actor* actor, Vec3s* headRot, Vec3s* tors actor->focus.pos = focusPos; - if (!((play->csCtx.state != 0) || gDbgCamEnabled)) { + if (!((play->csCtx.state != CS_STATE_IDLE) || gDbgCamEnabled)) { yaw = ABS_ALT(BINANG_SUB(actor->yawTowardsPlayer, actor->shape.rot.y)); if (yaw >= 0x4300) { Actor_TrackNone(headRot, torsoRot); @@ -135,7 +135,7 @@ s32 Actor_TrackPlayer(PlayState* play, Actor* actor, Vec3s* headRot, Vec3s* tors } } - if ((play->csCtx.state != 0) || gDbgCamEnabled) { + if ((play->csCtx.state != CS_STATE_IDLE) || gDbgCamEnabled) { target = play->view.eye; } else { target = player->actor.focus.pos; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 88b8f14cc..41441f3a2 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -4003,7 +4003,7 @@ void Interface_DrawItemButtons(PlayState* play) { } if (interfaceCtx->tatlCalling && (play->pauseCtx.state == PAUSE_STATE_OFF) && - (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && (play->csCtx.state == 0) && + (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && (play->csCtx.state == CS_STATE_IDLE) && (sPictoState == PICTO_BOX_STATE_OFF)) { if (sCUpInvisible == 0) { // C-Up Button Texture, Color & Label (Tatl Text) |