diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-05-09 07:35:54 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-08 23:35:54 +0200 |
| commit | 7da841fcc940b6ca90efd2e0911fee6c3e6dd0e1 (patch) | |
| tree | 8c085e90ee0bf2fa87209a38745c8cf490377518 /src/code/z_onepointdemo.c | |
| parent | 74bed3ec9b5b596138784c2fc2eb9fbaf13099aa (diff) | |
Restructuring Camera Structs and Related Macros (#1108)
* Proof-of-concept
* small cleanup
* static to fixed
* Update to new names
* Use full names for structs
* Update comments
* PR 1
* More macro changes
* More PR Suggestions
* Use a union for funcData
* Apply change to all cam structs
* typedef union outside of cam struct
* Add size
* typedef union, not struct
* funcData -> paramData
* Better manage doorParams
Diffstat (limited to 'src/code/z_onepointdemo.c')
| -rw-r--r-- | src/code/z_onepointdemo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 247f45dab..ea2bec75a 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -48,7 +48,7 @@ f32 OnePointCutscene_RaycastFloor(CollisionContext* colCtx, Vec3f* pos) { void OnePointCutscene_SetCsCamPoints(Camera* camera, s16 actionParameters, s16 initTimer, CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints) { - OnePointCsCamera* onePointCamData = (OnePointCsCamera*)&camera->paramData; + OnePointCamData* onePointCamData = &camera->paramData.demo9.onePointCamData; onePointCamData->atPoints = atPoints; onePointCamData->eyePoints = eyePoints; @@ -68,7 +68,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act PosRot spA0; PosRot sp8C; f32 tempRand; - Unique9OnePointCs* csInfo = ONEPOINT_CS_INFO(csCam); + OnePointCsInfo* csInfo = &csCam->paramData.uniq9.csInfo; switch (csId) { case 1020: |