mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-05 15:34:41 +00:00
Fix a number of warnings when compiling with GCC (#1239)
* Silence a number of GCC warnings * Remove * Suggested changes * Format * Fix comment in en_go2
This commit is contained in:
Tharo
GitHub
parent
5015af4c57
commit
451b24f79b
71 changed files with 298 additions and 86 deletions
|
|
@ -1380,7 +1380,7 @@ void func_80046E20(Camera* camera, VecSph* eyeAdjustment, f32 minDist, f32 arg3,
|
|||
|
||||
camera->eye = newEyeColChk.pos;
|
||||
atEyeColChk = newEyeColChk;
|
||||
|
||||
FALLTHROUGH;
|
||||
case 3:
|
||||
case 6:
|
||||
if (anim->unk_18 != 0) {
|
||||
|
|
@ -1475,6 +1475,7 @@ s32 Camera_Normal1(Camera* camera) {
|
|||
case 20:
|
||||
camera->yawUpdateRateInv = OREG(27);
|
||||
camera->pitchUpdateRateInv = OREG(27);
|
||||
FALLTHROUGH;
|
||||
case 0:
|
||||
case 10:
|
||||
case 25:
|
||||
|
|
@ -2035,6 +2036,7 @@ s32 Camera_Parallel1(Camera* camera) {
|
|||
rwData->unk_00.x = 0.0f;
|
||||
rwData->yTarget = playerPosRot->pos.y - camera->playerPosDelta.y;
|
||||
camera->animState++;
|
||||
break;
|
||||
}
|
||||
|
||||
if (rwData->animTimer != 0) {
|
||||
|
|
@ -2153,7 +2155,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 No return
|
||||
//! @bug doesn't return
|
||||
}
|
||||
|
||||
s32 Camera_Parallel2(Camera* camera) {
|
||||
|
|
@ -2528,7 +2530,7 @@ s32 Camera_Jump3(Camera* camera) {
|
|||
f32 spC4;
|
||||
f32 spC0;
|
||||
f32 spBC;
|
||||
Vec3f spB0; // unused
|
||||
UNUSED Vec3f spB0;
|
||||
VecSph eyeDiffSph;
|
||||
PosRot* playerPosRot = &camera->playerPosRot;
|
||||
Jump3ReadOnlyData* roData = &camera->paramData.jump3.roData;
|
||||
|
|
@ -2611,8 +2613,7 @@ s32 Camera_Jump3(Camera* camera) {
|
|||
break;
|
||||
}
|
||||
|
||||
spB0 = *eye; // unused
|
||||
(void)spB0; // suppresses set but unused warning
|
||||
spB0 = *eye;
|
||||
|
||||
spC4 = CAM_DATA_SCALED(OREG(25)) * camera->speedRatio;
|
||||
spC0 = camera->speedRatio * CAM_DATA_SCALED(OREG(26));
|
||||
|
|
@ -3027,6 +3028,7 @@ s32 Camera_Battle4(Camera* camera) {
|
|||
case 20:
|
||||
rwData->animTimer = 50;
|
||||
camera->animState++;
|
||||
break;
|
||||
}
|
||||
|
||||
camera->yawUpdateRateInv = Camera_LERPCeilF(roData->lerpUpdateRate, camera->yawUpdateRateInv,
|
||||
|
|
@ -3798,7 +3800,7 @@ s32 Camera_KeepOn0(Camera* camera) {
|
|||
KeepOn0ReadWriteData* rwData = &camera->paramData.keep0.rwData;
|
||||
s32 pad;
|
||||
Vec3s* sceneCamData;
|
||||
Vec3s sceneCamRot;
|
||||
UNUSED Vec3s sceneCamRot;
|
||||
s16 fov;
|
||||
|
||||
camera->unk_14C &= ~0x10;
|
||||
|
|
@ -3818,8 +3820,7 @@ s32 Camera_KeepOn0(Camera* camera) {
|
|||
Camera_Vec3sToVec3f(eyeNext, &BGCAM_POS(sceneCamData));
|
||||
*eye = *eyeNext;
|
||||
|
||||
sceneCamRot = BGCAM_ROT(sceneCamData); // unused
|
||||
(void)sceneCamRot; // suppresses set but unused warning
|
||||
sceneCamRot = BGCAM_ROT(sceneCamData);
|
||||
|
||||
fov = BGCAM_FOV(sceneCamData);
|
||||
if (fov == -1) {
|
||||
|
|
@ -4734,6 +4735,7 @@ s32 Camera_Unique3(Camera* camera) {
|
|||
rwData->initialFov = camera->fov;
|
||||
rwData->initialDist = OLib_Vec3fDist(at, &camera->eye);
|
||||
camera->animState++;
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
if (doorParams->timer1-- > 0) {
|
||||
break;
|
||||
|
|
@ -4747,7 +4749,7 @@ s32 Camera_Unique3(Camera* camera) {
|
|||
sp60.pitch = -sp4C.x;
|
||||
Camera_Vec3fVecSphGeoAdd(at, &camera->eye, &sp60);
|
||||
camera->animState++;
|
||||
|
||||
FALLTHROUGH;
|
||||
case 2:
|
||||
if (roData->interfaceFlags & 4) {
|
||||
camera->at = cameraPlayerPosRot->pos;
|
||||
|
|
@ -4757,7 +4759,7 @@ s32 Camera_Unique3(Camera* camera) {
|
|||
break;
|
||||
}
|
||||
camera->animState++;
|
||||
|
||||
FALLTHROUGH;
|
||||
case 3:
|
||||
camera->unk_14C |= (0x400 | 0x10);
|
||||
if ((camera->unk_14C & 8) != 0) {
|
||||
|
|
@ -4765,6 +4767,7 @@ s32 Camera_Unique3(Camera* camera) {
|
|||
} else {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 4:
|
||||
if (roData->interfaceFlags & 2) {
|
||||
camera->unk_14C |= 4;
|
||||
|
|
@ -4785,6 +4788,7 @@ s32 Camera_Unique3(Camera* camera) {
|
|||
} else {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 5:
|
||||
camera->fov = Camera_LERPCeilF(rwData->initialFov, camera->fov, 0.4f, 0.1f);
|
||||
OLib_Vec3fDiffToVecSphGeo(&sp60, at, &camera->eye);
|
||||
|
|
@ -4795,6 +4799,7 @@ s32 Camera_Unique3(Camera* camera) {
|
|||
break;
|
||||
}
|
||||
camera->animState++;
|
||||
FALLTHROUGH;
|
||||
default:
|
||||
camera->unk_14C |= 4;
|
||||
camera->unk_14C &= ~8;
|
||||
|
|
@ -4996,7 +5001,7 @@ s32 Camera_Unique7(Camera* camera) {
|
|||
VecSph playerPosEyeOffset;
|
||||
s16 fov;
|
||||
Vec3s* sceneCamData;
|
||||
Vec3s sceneCamRot;
|
||||
UNUSED Vec3s sceneCamRot;
|
||||
Vec3f* at = &camera->at;
|
||||
PosRot* playerPosRot = &camera->playerPosRot;
|
||||
Vec3f* eye = &camera->eye;
|
||||
|
|
@ -5016,8 +5021,7 @@ s32 Camera_Unique7(Camera* camera) {
|
|||
|
||||
Camera_Vec3sToVec3f(eyeNext, &BGCAM_POS(sceneCamData));
|
||||
*eye = *eyeNext;
|
||||
sceneCamRot = BGCAM_ROT(sceneCamData); // unused
|
||||
(void)sceneCamRot; // suppresses set but unused warning
|
||||
sceneCamRot = BGCAM_ROT(sceneCamData);
|
||||
|
||||
OLib_Vec3fDiffToVecSphGeo(&playerPosEyeOffset, eye, &playerPosRot->pos);
|
||||
|
||||
|
|
@ -5392,6 +5396,7 @@ s32 Camera_Unique9(Camera* camera) {
|
|||
Camera_LERPFloorF(eyeTarget.y, camera->eyeNext.y, rwData->curKeyFrame->lerpStepScale, 1.0f);
|
||||
camera->eyeNext.z =
|
||||
Camera_LERPFloorF(eyeTarget.z, camera->eyeNext.z, rwData->curKeyFrame->lerpStepScale, 1.0f);
|
||||
FALLTHROUGH;
|
||||
case 9:
|
||||
case 10:
|
||||
// linear interpolation of at/fov/roll
|
||||
|
|
@ -5427,6 +5432,7 @@ s32 Camera_Unique9(Camera* camera) {
|
|||
Camera_LERPCeilF(rwData->eyeTarget.y, camera->eyeNext.y, rwData->curKeyFrame->lerpStepScale, 1.0f);
|
||||
camera->eyeNext.z =
|
||||
Camera_LERPCeilF(rwData->eyeTarget.z, camera->eyeNext.z, rwData->curKeyFrame->lerpStepScale, 1.0f);
|
||||
FALLTHROUGH;
|
||||
case 11:
|
||||
case 12:
|
||||
setAtFOVRoll:
|
||||
|
|
@ -5477,6 +5483,7 @@ s32 Camera_Unique9(Camera* camera) {
|
|||
|
||||
Camera_ChangeModeFlags(camera->play->cameraPtrs[camIdx], CAM_MODE_NORMAL, 1);
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 18: {
|
||||
// copy the current camera to the parent (or default)'s camera.
|
||||
s32 camIdx = camera->parentCamId <= CAM_ID_NONE ? CAM_ID_MAIN : camera->parentCamId;
|
||||
|
|
@ -5485,10 +5492,12 @@ s32 Camera_Unique9(Camera* camera) {
|
|||
*eye = *eyeNext;
|
||||
Camera_Copy(cam, camera);
|
||||
}
|
||||
FALLTHROUGH;
|
||||
default:
|
||||
if (camera->camId != CAM_ID_MAIN) {
|
||||
camera->timer = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
*eye = *eyeNext;
|
||||
|
|
@ -5608,6 +5617,7 @@ s32 Camera_Demo1(Camera* camera) {
|
|||
Camera_DebugPrintSplineArray("CENTER", 5, csAtPoints);
|
||||
Camera_DebugPrintSplineArray(" EYE", 5, csEyePoints);
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
// follow CutsceneCameraPoints. function returns 1 if at the end.
|
||||
if (func_800BB2B4(&csEyeUpdate, &newRoll, cameraFOV, csEyePoints, &rwData->keyframe, &rwData->curFrame) ||
|
||||
|
|
@ -5787,6 +5797,7 @@ s32 Camera_Demo3(Camera* camera) {
|
|||
if (camera->unk_14C & 8) {
|
||||
camera->animState = 4;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 10:
|
||||
case 20:
|
||||
skipUpdateEye = true;
|
||||
|
|
@ -5810,7 +5821,7 @@ s32 Camera_Demo3(Camera* camera) {
|
|||
camera->unk_14C & 8)) {
|
||||
goto skipeyeUpdate;
|
||||
}
|
||||
|
||||
FALLTHROUGH;
|
||||
default:
|
||||
camera->unk_14C |= 0x14;
|
||||
camera->unk_14C &= ~8;
|
||||
|
|
@ -6141,6 +6152,7 @@ s32 Camera_Demo6(Camera* camera) {
|
|||
Camera_Vec3fVecSphGeoAdd(eyeNext, &camera->at, &eyeOffset);
|
||||
camera->eye = *eyeNext;
|
||||
camera->animState++;
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
if (stateTimers[camera->animState] < rwData->animTimer) {
|
||||
func_8002DF54(camera->play, &camera->player->actor, 8);
|
||||
|
|
@ -6152,6 +6164,7 @@ s32 Camera_Demo6(Camera* camera) {
|
|||
} else {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 2:
|
||||
Camera_LERPCeilVec3f(&rwData->atTarget, &camera->at, 0.1f, 0.1f, 8.0f);
|
||||
if (stateTimers[camera->animState] < rwData->animTimer) {
|
||||
|
|
@ -6159,6 +6172,7 @@ s32 Camera_Demo6(Camera* camera) {
|
|||
} else {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 3:
|
||||
camera->fov = Camera_LERPCeilF(50.0f, camera->fov, 0.2f, 0.01f);
|
||||
if (stateTimers[camera->animState] < rwData->animTimer) {
|
||||
|
|
@ -6243,6 +6257,7 @@ s32 Camera_Demo9(Camera* camera) {
|
|||
onePointCamData->actionParameters &= 0xFFF;
|
||||
}
|
||||
rwData->animTimer = onePointCamData->initTimer;
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
// Run the camera state
|
||||
if (rwData->animTimer > 0) {
|
||||
|
|
@ -6296,6 +6311,7 @@ s32 Camera_Demo9(Camera* camera) {
|
|||
rwData->animTimer--;
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 3:
|
||||
// the cs is finished, decide the next action
|
||||
camera->timer = 0;
|
||||
|
|
@ -6738,6 +6754,7 @@ s32 Camera_Special9(Camera* camera) {
|
|||
rwData->targetYaw = ABS(playerPosRot->rot.y - adjustedPlayerPosRot.rot.y) >= 0x4000
|
||||
? BINANG_ROT180(adjustedPlayerPosRot.rot.y)
|
||||
: adjustedPlayerPosRot.rot.y;
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
doorParams->timer1--;
|
||||
if (doorParams->timer1 <= 0) {
|
||||
|
|
@ -6767,6 +6784,7 @@ s32 Camera_Special9(Camera* camera) {
|
|||
} else {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 2:
|
||||
spAC = playerPosRot->pos;
|
||||
spAC.y += playerYOffset + roData->yOffset;
|
||||
|
|
@ -6779,6 +6797,7 @@ s32 Camera_Special9(Camera* camera) {
|
|||
} else {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 3:
|
||||
spAC = playerPosRot->pos;
|
||||
spAC.y += (playerYOffset + roData->yOffset);
|
||||
|
|
@ -6794,8 +6813,10 @@ s32 Camera_Special9(Camera* camera) {
|
|||
} else {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
case 4:
|
||||
camera->animState++;
|
||||
FALLTHROUGH;
|
||||
default:
|
||||
camera->unk_14C |= (0x400 | 0x10);
|
||||
sCameraInterfaceFlags = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue