diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-04-04 22:48:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-04 23:48:12 +0200 |
| commit | 208167361b39abc335aac248fcbc8e5941d070c0 (patch) | |
| tree | 505ec2c1d28ef0f5eb6d08a1768a7ddfeca8e7a3 /src/code | |
| parent | 8b87e53b768ca4c08b5853ff3b3e6ed0b2a91976 (diff) | |
Poe Objects (#743)
* poe objects
* Last unaccounted resolved, name suffix fixes
* remove _tex
* missed 2
* format
Co-authored-by: Fig02 <fig02srl@gmail.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_camera.c | 4 | ||||
| -rw-r--r-- | src/code/z_onepointdemo.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 6b15d4c32..b746da902 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -6178,8 +6178,8 @@ s32 Camera_Demo9(Camera* camera) { // Run the at and eye cs interpoloation functions, if either of them return 1 (that no more points // exist) change the animation state to 2 (standby) - if (func_800BB2B4(&csEyeUpdate, &newRoll, camFOV, demo9OnePoint->onePointCs.eyePoints, - &anim->keyframe, &anim->curFrame) != 0 || + if (func_800BB2B4(&csEyeUpdate, &newRoll, camFOV, demo9OnePoint->onePointCs.eyePoints, &anim->keyframe, + &anim->curFrame) != 0 || func_800BB2B4(&csAtUpdate, &newRoll, camFOV, demo9OnePoint->onePointCs.atPoints, &anim->keyframe, &anim->curFrame) != 0) { camera->animState = 2; diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index acdcae4c6..d3f995642 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -47,7 +47,7 @@ f32 OnePointCutscene_RaycastFloor(CollisionContext* colCtx, Vec3f* pos) { } void OnePointCutscene_SetCsCamPoints(Camera* camera, s16 actionParameters, s16 initTimer, CutsceneCameraPoint* atPoints, - CutsceneCameraPoint* eyePoints) { + CutsceneCameraPoint* eyePoints) { OnePointCsCamera* onePointCamData = (OnePointCsCamera*)&camera->paramData; onePointCamData->atPoints = atPoints; |
