diff options
| author | fig02 <fig02srl@gmail.com> | 2023-01-02 06:15:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-02 06:15:48 -0500 |
| commit | b4c97ce17eb35329b4a7e3d98d7f06d558683f6d (patch) | |
| tree | f09e06d32f7cc8b0d6a8d1764b7abf0b0aaaf712 /src/code | |
| parent | e77b83cf1b76fa4a3774e10e554300adfb1c76ce (diff) | |
Cleanup player speed and yaw variable names (#1480)
* initial changes
* add comments
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_800430A0.c | 2 | ||||
| -rw-r--r-- | src/code/z_onepointdemo.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c index 5ca844a12..98068012f 100644 --- a/src/code/code_800430A0.c +++ b/src/code/code_800430A0.c @@ -59,7 +59,7 @@ void DynaPolyActor_UpdateCarriedActorRotY(CollisionContext* colCtx, s32 bgId, Ac s16 rotY = colCtx->dyna.bgActors[bgId].curTransform.rot.y - colCtx->dyna.bgActors[bgId].prevTransform.rot.y; if (carriedActor->id == ACTOR_PLAYER) { - ((Player*)carriedActor)->currentYaw += rotY; + ((Player*)carriedActor)->yaw += rotY; } carriedActor->shape.rot.y += rotY; diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index bf1a2a752..cfe61236f 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -664,7 +664,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act Play_SetCameraAtEye(play, subCamId, &spC0, &spB4); subCam->roll = 0; subCam->fov = 75.0f; - player->actor.shape.rot.y = player->actor.world.rot.y = player->currentYaw = spD0.yaw + 0x7FFF; + player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = spD0.yaw + 0x7FFF; func_8002DF54(play, NULL, PLAYER_CSMODE_8); break; @@ -708,7 +708,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act break; case 3390: - player->actor.shape.rot.y = player->actor.world.rot.y = player->currentYaw = -0x3FD9; + player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = -0x3FD9; csInfo->keyFrames = D_80121DB4; csInfo->keyFrameCount = ARRAY_COUNT(D_80121DB4); @@ -733,7 +733,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act D_80121F1C[0].eyeTargetInit = play->view.eye; D_80121F1C[0].fovTargetInit = play->view.fovy; Actor_GetFocus(&spA0, actor); - player->actor.shape.rot.y = player->actor.world.rot.y = player->currentYaw = spA0.rot.y; + player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = spA0.rot.y; csInfo->keyFrames = D_80121F1C; csInfo->keyFrameCount = ARRAY_COUNT(D_80121F1C); @@ -857,7 +857,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act csInfo->keyFrames = D_801225D4; csInfo->keyFrameCount = ARRAY_COUNT(D_801225D4); - player->actor.shape.rot.y = player->actor.world.rot.y = player->currentYaw = 0x3FFC; + player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = 0x3FFC; Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C); func_8002DF54(play, NULL, PLAYER_CSMODE_8); break; |