From e1ffae717a2960862c39899b691f3adb5a40dade Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 17 Aug 2026 23:08:26 -0400 Subject: [PATCH] Remove some unnecessary camera casts --- src/d/actor/d_a_bdk.cpp | 2 +- src/d/actor/d_a_bpw.cpp | 2 +- src/d/actor/d_a_himo2.cpp | 4 ++-- src/d/actor/d_a_mo2.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 365debda0..97daa090a 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -1296,7 +1296,7 @@ static void wind_set(bdk_class* i_this, cXyz* param2) { } } } - camera = static_cast(dComIfGp_getCamera(0)); + camera = (camera_process_class*)dComIfGp_getCamera(0); vec2 = actor->eyePos - camera->mLookat.mEye; wind_se_pos = actor->eyePos + (camera->mLookat.mEye - actor->eyePos) * 0.8f; mDoAud_seStart(JA_SE_CM_DK_WIND, &wind_se_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 6249b91d5..d167c4574 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -2073,7 +2073,7 @@ void action_bunri_dousa(bpw_class* i_this) { f32 f2; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (i_this->mActionState) { case ACTION_STATE_SEPARATE_BUNRI_DOUSA_INIT: { for (s32 i = 0; i < 10; i++) { diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 9c0227793..7656a8c6a 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -775,7 +775,7 @@ static void new_himo2_move(himo2_class* i_this) { player_actor = dComIfGp_getPlayer(0); player = (daPy_py_c*)player_actor; - camera = (camera_process_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp100 = i_this->m02EC[0]; cXyz spF4 = i_this->m02EC[1]; // unused cXyz spE8; // unused @@ -875,7 +875,7 @@ static void new_himo2_move(himo2_class* i_this) { i_this->m029E = 0; i_this->m02A0 = REG0_S(9) + 10; i_this->m02A2 = 3; - camera2 = (camera_process_class*)dComIfGp_getCamera(0); + camera2 = dComIfGp_getCamera(0); f28 = i_this->m2524.x - camera2->mLookat.mEye.x; f27 = i_this->m2524.y - camera2->mLookat.mEye.y; f26_3 = i_this->m2524.z - camera2->mLookat.mEye.z; diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index f1648d1b8..518df2683 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -2775,7 +2775,7 @@ static void carry_drop(mo2_class* i_this) { static void e3_demo(mo2_class* i_this) { fopAc_ac_c* actor = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); i_this->m05B4 = 5; i_this->mDamageReaction.m4D0 = fopAcM_searchPlayerAngleY(actor);