mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-14 12:24:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

cs state cleanup (#1229)

Browse Source
This commit is contained in:
engineer124
2023-04-22 05:54:47 +10:00
committed by GitHub
parent 40846f3d3a
commit 24454b2277
37 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_800E8EA0.c
+4 -4
View File
@@ -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;
src/code/z_parameter.c
+1 -1
View File
@@ -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)