match last function in d_camera.cpp (#2971)

Co-authored-by: Cuyler36 <Cuyler36@users.noreply.github.com>
This commit is contained in:
roeming 2025-12-19 20:24:18 -05:00 committed by GitHub
parent 2c62444df1
commit f9d69372a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

View File

@ -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"),

View File

@ -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; }
};

View File

@ -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};