From 2b4a50803a3475e24c279bb8528e398a1f9ef1dd Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Fri, 14 Mar 2025 13:34:18 +0000 Subject: [PATCH] Add float f suffix --- src/REL/d/a/obj/d_a_obj_fence_boko.cpp | 2 +- src/REL/d/a/obj/d_a_obj_fence_boko2.cpp | 2 +- src/REL/d/a/obj/d_a_obj_iron_stage.cpp | 2 +- src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp | 4 ++-- src/REL/d/a/obj/d_a_obj_shrine_after.cpp | 2 +- src/REL/d/a/obj/d_a_obj_shrine_before.cpp | 2 +- src/egg/core/eggController.cpp | 13 ++++++------- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/REL/d/a/obj/d_a_obj_fence_boko.cpp b/src/REL/d/a/obj/d_a_obj_fence_boko.cpp index 854552be..2ac61e55 100644 --- a/src/REL/d/a/obj/d_a_obj_fence_boko.cpp +++ b/src/REL/d/a/obj/d_a_obj_fence_boko.cpp @@ -27,7 +27,7 @@ int dAcOfenceBoko_c::create() { roomid = mCollision.mRoomId; mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-210.0f, -10.0f, -20.0f), mVec3_c(210.0f, 340.0f, 20.0f)); - mCullingDistance = 50000.0; + mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp b/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp index 8792f07a..f55c87b1 100644 --- a/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp +++ b/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp @@ -23,7 +23,7 @@ int dAcOfenceBoko2_c::create() { dBgS::GetInstance()->RegistBg(&mCollision, this); mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-160.0f, -40.0f, -70.0f), mVec3_c(180.0f, 300.0f, 60.0f)); - mCullingDistance = 50000.0; + mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp index 9ee35a1f..e4f2b57e 100644 --- a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp +++ b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp @@ -23,7 +23,7 @@ int dAcOironStage_c::create() { dBgS::GetInstance()->Regist(&mCollision, this); mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-460.0f, -210.0f, -260.0f), mVec3_c(460.0f, 210.0f, 260.0f)); - mCullingDistance = 15000.0; + mCullingDistance = 15000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp b/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp index 90f046c8..42d95a42 100644 --- a/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp +++ b/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp @@ -44,9 +44,9 @@ int dAcOpumpkinBar_c::create() { // 100000.0 is in the rodata and the instructions need it. // This also works if a separate variable is used but I // think it's more likely that mCullingDistance got set twice. - mCullingDistance = 100000.0; + mCullingDistance = 100000.0f; boundingBox.Set(mVec3_c(-2790.0f, -1450.0f, -8270.0f), mVec3_c(2880.0f, 2120.0f, 1370.0f)); - mCullingDistance = 500000.0; + mCullingDistance = 500000.0f; mBarCollision.SetRideCallback(barCollisionRideCallback); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_shrine_after.cpp b/src/REL/d/a/obj/d_a_obj_shrine_after.cpp index 4796600c..782c3883 100644 --- a/src/REL/d/a/obj/d_a_obj_shrine_after.cpp +++ b/src/REL/d/a/obj/d_a_obj_shrine_after.cpp @@ -15,7 +15,7 @@ int dAcOshrineAfter_c::create() { mModel.setLocalMtx(mWorldMtx); mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-4000.0f, 7000.0f, 5000.0f), mVec3_c(5000.0f, 15000.0f, 14000.0f)); - mCullingDistance = 50000.0; + mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_shrine_before.cpp b/src/REL/d/a/obj/d_a_obj_shrine_before.cpp index 9bca3319..441a93fd 100644 --- a/src/REL/d/a/obj/d_a_obj_shrine_before.cpp +++ b/src/REL/d/a/obj/d_a_obj_shrine_before.cpp @@ -15,7 +15,7 @@ int dAcOshrineBefore_c::create() { mModel.setLocalMtx(mWorldMtx); mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-4000.0f, 7000.0f, 5000.0f), mVec3_c(4000.0f, 13000.0f, 14000.0f)); - mCullingDistance = 50000.0; + mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/egg/core/eggController.cpp b/src/egg/core/eggController.cpp index b73a02a4..bcc0c551 100644 --- a/src/egg/core/eggController.cpp +++ b/src/egg/core/eggController.cpp @@ -8,7 +8,6 @@ #include "rvl/VI.h" // IWYU pragma: export #include "string.h" - EGG::NullController null_controller; namespace EGG { @@ -63,8 +62,8 @@ CoreController::CoreController() : mDpdPos(), mAccel(), mAccelFlags(), mFlag(0) void CoreController::sceneReset() { mAccel.set(0.0, 0.0, 0.0); - mDpdPos.x = 0.0; - mDpdPos.y = 0.0; + mDpdPos.x = 0.0f; + mDpdPos.y = 0.0f; mIdleTime = 0; mPostureMatrixPrev.makeIdentity(); mPostureMatrix.makeIdentity(); @@ -286,7 +285,7 @@ void CoreController::endFrame() { /* 0x80499AC0 */ f32 CoreController::getFreeStickX() const { if (mCoreStatus->getDevType() == WPAD_DEV_CORE) { - return 0.0; + return 0.0f; } return mCoreStatus[0].getFSStickX(); } @@ -294,7 +293,7 @@ f32 CoreController::getFreeStickX() const { /* 0x80499AE0 */ f32 CoreController::getFreeStickY() const { if (mCoreStatus->getDevType() == WPAD_DEV_CORE) { - return 0.0; + return 0.0f; } return mCoreStatus[0].getFSStickY(); } @@ -429,8 +428,8 @@ void ControllerRumbleUnit::init() { mPattern = nullptr; mPatternPos = nullptr; mTimer = 0; - mIntensity = 0.0; - mRampUp = 0.0; + mIntensity = 0.0f; + mRampUp = 0.0f; mFlag.makeAllZero(); }