diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2024-12-02 09:40:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-02 04:40:49 -0500 |
| commit | 3f703a39d91b0f90a273ca24fedfc7e6578ad363 (patch) | |
| tree | 43437f65da1a62794a87e29d28a9bf4df5e2c6b5 /src/code/z_camera.c | |
| parent | 6199634ffb42872d053abb1502eb80474de4ae56 (diff) | |
Fix some more GCC warnings, mark some bugs based on GCC warnings (#2309)
* Fix some more GCC warnings, mark some bugs based on GCC warnings
* Weird formatting
* Suggested changes
* More weird indentation I guess
* UNREACHABLE() macro, add missing NORETURNs to fault_n64.c
* AVOID_UB for PAL path in z_file_nameset.c
* Remove comments about return types
* Remove temp no longer needed
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index aca9f4487..1ddc538dc 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -612,10 +612,10 @@ Vec3s* Camera_GetBgCamFuncData(Camera* camera) { */ s32 Camera_GetBgCamIndex(Camera* camera, s32* bgId, CollisionPoly* poly) { s32 bgCamIndex; - PosRot playerPosRot; + UNUSED PosRot playerPosRot; s32 ret; - playerPosRot = Actor_GetWorldPosShapeRot(&camera->player->actor); // unused. + playerPosRot = Actor_GetWorldPosShapeRot(&camera->player->actor); bgCamIndex = SurfaceType_GetBgCamIndex(&camera->play->colCtx, poly, *bgId); if (BgCheck_GetBgCamSettingImpl(&camera->play->colCtx, bgCamIndex, *bgId) == CAM_SET_NONE) { @@ -947,7 +947,7 @@ void Camera_UpdateInterface(s16 interfaceField) { Vec3f Camera_BGCheckCorner(Vec3f* linePointA, Vec3f* linePointB, CamColChk* pointAColChk, CamColChk* pointBColChk) { Vec3f closestPoint; - bool result; + UNUSED_NDEBUG bool result; result = func_800427B4(pointAColChk->poly, pointBColChk->poly, linePointA, linePointB, &closestPoint); #if DEBUG_FEATURES @@ -2302,7 +2302,7 @@ s32 Camera_Parallel1(Camera* camera) { camera->fov = Camera_LERPCeilF(roData->fovTarget, camera->fov, camera->fovUpdateRate, 1.0f); camera->roll = Camera_LERPCeilS(0, camera->roll, 0.5, 0xA); camera->atLERPStepScale = Camera_ClampLERPScale(camera, sp6A ? roData->unk_1C : roData->unk_14); - //! @bug doesn't return + //! @bug Missing return, but the return value is not used. } s32 Camera_Parallel2(Camera* camera) { @@ -2321,7 +2321,7 @@ s32 Camera_Parallel3(Camera* camera) { if (interfaceField & PARALLEL3_FLAG_1) { camera->stateFlags |= CAM_STATE_CAM_FUNC_FINISH; } - //! @bug doesn't return + //! @bug Missing return, but the return value is not used. } s32 Camera_Parallel4(Camera* camera) { @@ -2347,7 +2347,7 @@ s32 Camera_Jump1(Camera* camera) { VecGeo eyeDiffGeo; VecGeo eyeDiffTarget; PosRot* playerPosRot = &camera->playerPosRot; - PosRot playerhead; + UNUSED PosRot playerhead; s16 tangle; Jump1ReadOnlyData* roData = &camera->paramData.jump1.roData; Jump1ReadWriteData* rwData = &camera->paramData.jump1.rwData; @@ -2371,7 +2371,6 @@ s32 Camera_Jump1(Camera* camera) { CAM_DEBUG_RELOAD_PREG(camera); - // playerhead never gets used. playerhead = Actor_GetFocus(&camera->player->actor); eyeAtOffset = OLib_Vec3fDiffToVecGeo(at, eye); @@ -2490,7 +2489,7 @@ s32 Camera_Jump2(Camera* camera) { VecGeo adjAtToEyeDir; VecGeo bgChkPara; VecGeo atToEyeNextDir; - VecGeo atToEyeDir; + UNUSED VecGeo atToEyeDir; f32 temp_f14; f32 temp_f16; f32 sp90; @@ -3121,6 +3120,7 @@ s32 Camera_Battle1(Camera* camera) { : 1.0f) * (fov - ((fov * 0.05f) * distRatio)), camera->fov, camera->fovUpdateRate, 1.0f); + //! @bug Missing return, but the return value is not used. } s32 Camera_Battle2(Camera* camera) { @@ -3467,13 +3467,13 @@ s32 Camera_KeepOn3(Camera* camera) { Actor* colChkActors[2]; VecGeo targetToPlayerDir; VecGeo atToEyeAdj; - VecGeo atToEyeDir; + UNUSED VecGeo atToEyeDir; VecGeo atToEyeNextDir; s32 i; s32 angleCnt; s16 sp82; s16 sp80; - PosRot playerPosRot; + UNUSED PosRot playerPosRot; PosRot* camPlayerPosRot = &camera->playerPosRot; KeepOn3ReadOnlyData* roData = &camera->paramData.keep3.roData; KeepOn3ReadWriteData* rwData = &camera->paramData.keep3.rwData; @@ -3653,7 +3653,7 @@ s32 Camera_KeepOn4(Camera* camera) { f32 temp_f0_2; CollisionPoly* spC0; VecGeo spB8; - VecGeo spB0; + UNUSED VecGeo spB0; VecGeo spA8; s16* temp_s0 = &camera->data2; s16 spA2; @@ -3952,6 +3952,7 @@ s32 Camera_KeepOn4(Camera* camera) { Camera_BGCheck(camera, at, eye); camera->fov = Camera_LERPCeilF(roData->unk_18, camera->fov, camera->fovUpdateRate, 1.0f); camera->roll = Camera_LERPCeilS(0, camera->roll, 0.5f, 0xA); + //! @bug Missing return, but the return value is not used. } /** @@ -4188,7 +4189,7 @@ s32 Camera_Fixed3(Camera* camera) { Vec3f* eyeNext = &camera->eyeNext; VecGeo atGeo; BgCamFuncData* bgCamFuncData; - VecGeo eyeAtOffset; + UNUSED VecGeo eyeAtOffset; Fixed3ReadOnlyData* roData = &camera->paramData.fixd3.roData; Fixed3ReadWriteData* rwData = &camera->paramData.fixd3.rwData; s32 pad; @@ -4346,7 +4347,7 @@ s32 Camera_Subj3(Camera* camera) { Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; Vec3f sp98; - Vec3f sp8C; + UNUSED Vec3f sp8C; VecGeo sp84; VecGeo sp7C; VecGeo tGeo; @@ -4741,7 +4742,7 @@ s32 Camera_Unique1(Camera* camera) { VecGeo eyeAtOffset; VecGeo eyeNextAtOffset; PosRot* playerPosRot = &camera->playerPosRot; - PosRot playerhead; + UNUSED PosRot playerhead; Unique1ReadOnlyData* roData = &camera->paramData.uniq1.roData; Unique1ReadWriteData* rwData = &camera->paramData.uniq1.rwData; s32 pad; @@ -4784,7 +4785,7 @@ s32 Camera_Unique1(Camera* camera) { camera->animState++; } - playerhead = Actor_GetFocus(&camera->player->actor); // unused + playerhead = Actor_GetFocus(&camera->player->actor); camera->yawUpdateRateInv = Camera_LERPCeilF(100.0f, camera->yawUpdateRateInv, CAM_UPDATE_RATE_STEP_SCALE_XZ, 0.1f); camera->pitchUpdateRateInv = @@ -6719,7 +6720,7 @@ s32 Camera_Demo7(Camera* camera) { camera->stateFlags |= CAM_STATE_DEMO7; camera->animState++; } - //! @bug doesn't return + //! @bug Missing return, but the return value is not used. } s32 Camera_Demo8(Camera* camera) { @@ -6975,7 +6976,7 @@ s32 Camera_Special5(Camera* camera) { CamColChk sp7C; VecGeo sp74; VecGeo sp6C; - VecGeo sp64; + UNUSED VecGeo sp64; VecGeo sp5C; PosRot* playerPosRot = &camera->playerPosRot; Special5ReadOnlyData* roData = &camera->paramData.spec5.roData; @@ -7177,7 +7178,7 @@ s32 Camera_Special6(Camera* camera) { Vec3f eyePosCalc; Vec3f eyeAnim; Vec3f atAnim; - VecGeo eyeAtOffset; + UNUSED VecGeo eyeAtOffset; PosRot* playerPosRot = &camera->playerPosRot; BgCamFuncData* bgCamFuncData; Vec3s bgCamRot; @@ -7876,7 +7877,7 @@ s32 Camera_UpdateWater(Camera* camera) { } Audio_SetExtraFilter(0); } - //! @bug: doesn't always return a value, but sometimes does. + //! @bug Missing return, but the return value is not used. } s32 Camera_UpdateHotRoom(Camera* camera) { @@ -8617,8 +8618,7 @@ s32 Camera_RequestBgCam(Camera* camera, s32 requestedBgCamIndex) { #endif return 0x80000000 | requestedBgCamIndex; } - - //! @note: no return here, but return is unused + //! @bug Missing return, but the return value is not used. } Vec3s Camera_GetInputDir(Camera* camera) { |
