diff options
| author | fig02 <fig02srl@gmail.com> | 2023-09-26 12:48:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 12:48:41 -0400 |
| commit | 2cb4ff4fd3d36157dd03d68321dbeb99ba5c6845 (patch) | |
| tree | 3fd5ee26441b24b6c226659b3dc4b55466d2cea9 /src/code/z_camera.c | |
| parent | 092f6026384b193df93a9836548bc788dec7c81c (diff) | |
Player Docs: csMode -> csAction (#1547)
* csmode -> cs action
* format
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 9858cfdfa..d62b94596 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -5263,10 +5263,10 @@ s32 Camera_Unique9(Camera* camera) { } else if (ONEPOINT_CS_INIT_FIELD_IS_TYPE_HUD_VISIBILITY(rwData->curKeyFrame->initField)) { Camera_UpdateInterface( CAM_INTERFACE_FIELD(CAM_LETTERBOX_IGNORE, rwData->curKeyFrame->initField, 0)); - } else { // initField is of type PlayerCsMode + } else { // initField is a PlayerCsAction if ((camera->player->stateFlags1 & PLAYER_STATE1_27) && (player->currentBoots != PLAYER_BOOTS_IRON)) { - func_8002DF38(camera->play, camera->target, PLAYER_CSMODE_8); + func_8002DF38(camera->play, camera->target, PLAYER_CSACTION_8); osSyncPrintf("camera: demo: player demo set WAIT\n"); } else { osSyncPrintf("camera: demo: player demo set %d\n", rwData->curKeyFrame->initField); @@ -6236,14 +6236,14 @@ s32 Camera_Demo5(Camera* camera) { framesDiff = camera->play->state.frames - sDemo5PrevAction12Frame; if (player->stateFlags1 & PLAYER_STATE1_11) { // holding object over head. - func_8002DF54(camera->play, camera->target, PLAYER_CSMODE_8); + func_8002DF54(camera->play, camera->target, PLAYER_CSACTION_8); } else if (ABS(framesDiff) > 3000) { - func_8002DF54(camera->play, camera->target, PLAYER_CSMODE_12); + func_8002DF54(camera->play, camera->target, PLAYER_CSACTION_12); } else { - func_8002DF54(camera->play, camera->target, PLAYER_CSMODE_69); + func_8002DF54(camera->play, camera->target, PLAYER_CSACTION_69); } } else { - func_8002DF54(camera->play, camera->target, PLAYER_CSMODE_1); + func_8002DF54(camera->play, camera->target, PLAYER_CSACTION_1); } } @@ -6305,7 +6305,7 @@ s32 Camera_Demo6(Camera* camera) { FALLTHROUGH; case 1: if (stateTimers[camera->animState] < rwData->animTimer) { - func_8002DF54(camera->play, &camera->player->actor, PLAYER_CSMODE_8); + func_8002DF54(camera->play, &camera->player->actor, PLAYER_CSACTION_8); Actor_GetWorld(&focusPosRot, camFocus); rwData->atTarget.x = focusPosRot.pos.x; rwData->atTarget.y = focusPosRot.pos.y - 20.0f; @@ -7841,8 +7841,8 @@ void Camera_Finish(Camera* camera) { player->actor.freezeTimer = 0; player->stateFlags1 &= ~PLAYER_STATE1_29; - if (player->csMode != PLAYER_CSMODE_NONE) { - func_8002DF54(camera->play, &player->actor, PLAYER_CSMODE_7); + if (player->csAction != PLAYER_CSACTION_NONE) { + func_8002DF54(camera->play, &player->actor, PLAYER_CSACTION_7); osSyncPrintf("camera: player demo end!!\n"); } |