From b1376e4d3f10ab735de83ee5228971a2aa2a899e Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 16 Jun 2024 10:20:57 -0400 Subject: [PATCH] Fix ninja all_source compilation errors --- include/d/d_bg_s_gnd_chk.h | 2 +- include/d/d_cam_param.h | 4 +-- include/d/d_camera.h | 12 ++++----- src/d/d_camera.cpp | 55 -------------------------------------- src/f_op/f_op_msg_mng.cpp | 2 +- 5 files changed, 10 insertions(+), 65 deletions(-) diff --git a/include/d/d_bg_s_gnd_chk.h b/include/d/d_bg_s_gnd_chk.h index 84581d28d..c311a7224 100644 --- a/include/d/d_bg_s_gnd_chk.h +++ b/include/d/d_bg_s_gnd_chk.h @@ -69,7 +69,7 @@ class dBgS_CamGndChk : public dBgS_GndChk { public: dBgS_CamGndChk() { /* SetCam(); */ } - virtual ~dBgS_CamGndChk(); + virtual ~dBgS_CamGndChk() {} }; class dBgS_CamGndChk_Wtr : public dBgS_CamGndChk { diff --git a/include/d/d_cam_param.h b/include/d/d_cam_param.h index 8db69ab78..fca723833 100644 --- a/include/d/d_cam_param.h +++ b/include/d/d_cam_param.h @@ -125,8 +125,8 @@ public: dCamParam_c(s32); virtual ~dCamParam_c(); - void Flag(s32, u16); - void Val(s32, int); + void Flag(s32, u16) {} + void Val(s32, int) {} void Change(s32); void SearchStyle(u32); void ratiof(f32, f32, f32, f32); diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 2cc8d9568..f19f072a7 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -34,7 +34,7 @@ struct dCamera__EventParam { class d2DBSplinePath { public: - ~d2DBSplinePath(); + ~d2DBSplinePath() {} /* 0x00 */ int mKeyframeCur; /* 0x04 */ int mTimer; /* 0x08 */ int mKeyframeNum; @@ -64,8 +64,8 @@ public: class dCamera_c { public: struct BG { - BG(); - ~BG(); + BG() {} + ~BG() {} u8 temp[0xB0]; }; @@ -356,9 +356,9 @@ public: void SetExtendedPosition(cXyz*); void ScopeViewMsgModeOff(); - void Bank(); - void Up(); - void Center(); + void Bank() {} + void Up() {} + void Center() {} void StartEventCamera(int, int, ...); void EndEventCamera(int); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 06be122ca..3e501ed04 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -671,58 +671,3 @@ void dCamForcusLine::Draw() { void dCamForcusLine::Off() { /* Nonmatching */ } - -/* 8017CB18-8017CB60 .text __dt__14d2DBSplinePathFv */ -d2DBSplinePath::~d2DBSplinePath() { - /* Nonmatching */ -} - -/* 8017CB60-8017CDB4 .text __dt__Q29dCamera_c2BGFv */ -dCamera_c::BG::~BG() { - /* Nonmatching */ -} - -/* 8017CDB4-8017CF8C .text __ct__Q29dCamera_c2BGFv */ -dCamera_c::BG::BG() { - /* Nonmatching */ -} - -/* 8017CF8C-8017D0CC .text __dt__14dBgS_CamGndChkFv */ -dBgS_CamGndChk::~dBgS_CamGndChk() { - /* Nonmatching */ -} - -/* 8017D128-8017D13C .text setFlag__9dCamera_cFUl */ -void dCamera_c::setFlag(u32) { - /* Nonmatching */ -} - -/* 8017D13C-8017D150 .text chkFlag__9dCamera_cFUl */ -void dCamera_c::chkFlag(u32) { - /* Nonmatching */ -} - -/* 8017D150-8017D184 .text Bank__9dCamera_cFv */ -void dCamera_c::Bank() { - /* Nonmatching */ -} - -/* 8017D184-8017D1A0 .text Up__9dCamera_cFv */ -void dCamera_c::Up() { - /* Nonmatching */ -} - -/* 8017D1A0-8017D1D4 .text Center__9dCamera_cFv */ -void dCamera_c::Center() { - /* Nonmatching */ -} - -/* 8017D1D4-8017D1F4 .text Flag__11dCamParam_cFlUs */ -void dCamParam_c::Flag(s32, u16) { - /* Nonmatching */ -} - -/* 8017D200-8017D220 .text Val__11dCamParam_cFli */ -void dCamParam_c::Val(s32, int) { - /* Nonmatching */ -} diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index aa9c0f1b9..5946f3a3a 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -240,7 +240,7 @@ uint fopMsgM_messageSet(u32) { } /* 8002B9C4-8002BA4C .text fopMsgM_scopeMessageSet__FUl */ -void fopMsgM_scopeMessageSet(u32) { +uint fopMsgM_scopeMessageSet(u32) { /* Nonmatching */ }