diff options
| author | Synray <31429825+Synray@users.noreply.github.com> | 2021-02-15 09:29:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 18:29:06 +0100 |
| commit | 79c8accfaba2b7ca0bd0acdd8aa65d3805cb2ed8 (patch) | |
| tree | fc75b049344a069669a9335ee8d1bc139a23afcf /src/code/z_camera.c | |
| parent | 5bc23f58f80cdce021008ec798c6ac3e5f4a6bf0 (diff) | |
z_play.c OK (#701)
* z_play.c OK
* Change ~0x13 -> -20
* Back to hex
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index cfd5152b5..4bd292f2e 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -7302,7 +7302,7 @@ void func_80058E8C(Camera* camera) { } } -Vec3s* Camera_Update(Vec3s* outVec, Camera* camera) { +Vec3s Camera_Update(Camera* camera) { static s32 sOOBTimer = 0; Vec3f viewAt; Vec3f viewEye; @@ -7328,8 +7328,7 @@ Vec3s* Camera_Update(Vec3s* outVec, Camera* camera) { if (R_DBG_CAM_UPDATE) { osSyncPrintf("camera: cut out %x\n", camera); } - *outVec = camera->inputDir; - return outVec; + return camera->inputDir; } sUpdateCameraDirection = false; @@ -7402,8 +7401,7 @@ Vec3s* Camera_Update(Vec3s* outVec, Camera* camera) { if (R_DBG_CAM_UPDATE) { osSyncPrintf("camera: wait out %x\n", camera); } - *outVec = camera->inputDir; - return outVec; + return camera->inputDir; } camera->unk_14A = 0; @@ -7470,15 +7468,13 @@ Vec3s* Camera_Update(Vec3s* outVec, Camera* camera) { if (R_DBG_CAM_UPDATE) { osSyncPrintf("camera: debug out\n"); } - *outVec = D_8015BD80.unk_10C6; - return outVec; + return D_8015BD80.unk_10C6; } OREG(0) &= ~8; if (camera->status == 3) { - *outVec = camera->inputDir; - return outVec; + return camera->inputDir; } // setting bgCheckId to the ret of Quake_Calc, and checking that @@ -7551,8 +7547,7 @@ Vec3s* Camera_Update(Vec3s* outVec, Camera* camera) { } } - *outVec = camera->inputDir; - return outVec; + return camera->inputDir; } /** |