diff options
| author | roeming <brother64youyou@gmail.com> | 2025-12-19 20:24:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-19 17:24:18 -0800 |
| commit | f9d69372a11482a277f7455ba14e1055dc82c86d (patch) | |
| tree | bc784800c5ccf60b05bd0544f14c2f77a88b5c9e | |
| parent | 2c62444df10f84a18430f3b9acb13d7d33a23fb2 (diff) | |
match last function in d_camera.cpp (#2971)
Co-authored-by: Cuyler36 <Cuyler36@users.noreply.github.com>
| -rwxr-xr-x | configure.py | 2 | ||||
| -rw-r--r-- | include/SSystem/SComponent/c_angle.h | 1 | ||||
| -rw-r--r-- | src/d/d_camera.cpp | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.py b/configure.py index ce02907231..4a6a774d98 100755 --- a/configure.py +++ b/configure.py @@ -777,7 +777,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_insect.cpp"), Object(MatchingFor(ALL_GCN), "d/actor/d_a_obj_ss_base.cpp"), Object(MatchingFor(ALL_GCN), "d/actor/d_a_player.cpp"), - Object(NonMatching, "d/d_camera.cpp"), + Object(Equivalent, "d/d_camera.cpp"), # weak func order Object(MatchingFor(ALL_GCN), "d/d_envse.cpp"), Object(MatchingFor(ALL_GCN), "d/d_file_select.cpp"), Object(MatchingFor(ALL_GCN), "d/d_file_sel_warning.cpp"), diff --git a/include/SSystem/SComponent/c_angle.h b/include/SSystem/SComponent/c_angle.h index b82c9a1d11..40377f4283 100644 --- a/include/SSystem/SComponent/c_angle.h +++ b/include/SSystem/SComponent/c_angle.h @@ -52,7 +52,6 @@ public: bool operator>=(const cSAngle& other) const { return mAngle >= other.mAngle; } bool operator==(const cSAngle& other) const { return mAngle == other.mAngle; } operator s16(void) const { return mAngle; } - void operator=(const cSAngle& other) { mAngle = other.mAngle; } static inline cSAngle getMaxNegative(void) { return cSAngle((s16)-0x8000); } inline void mirrorAtMaxNeg(void) { *this = cSAngle((s16)-0x8000) - *this; } }; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index bad3ea79bd..c397cf96a0 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -298,7 +298,9 @@ static int specialType[42]; static int Stage; +#if WIDESCREEN_SUPPORT static f32 WideTurnSaving = 0.86f + OREG_F(1); +#endif inline static u32 check_owner_action(u32 param_0, u32 param_1) { return dComIfGp_checkPlayerStatus0(param_0, param_1); @@ -9425,7 +9427,6 @@ int dCamera_c::Reset() { return 1; } -// NONMATCHING - minor regalloc f32 dCamera_c::shakeCamera() { static f32 const wave[] = {0.4f, 0.9f, 2.1f, 3.2f}; |