Fix camera structs being swapped

`camera_process_class` and `camera_class` were swapped according to TP's RTTI info.
This commit is contained in:
LagoLunatic
2026-08-17 23:03:22 -04:00
parent e3f5172595
commit f0d5cd7b6a
58 changed files with 182 additions and 180 deletions
-8
View File
@@ -6,14 +6,6 @@
#include "d/d_bg_s_acch.h"
#include "d/d_particle.h"
class camera_class;
class mant_class;
class daBoko_c;
class daPy_py_c;
class mDoExt_McaMorf;
class mDoExt_brkAnm;
class mDoExt_btkAnm;
class fganon_class {
public:
/* 0x000 */ fopEn_enemy_c actor;
+1 -1
View File
@@ -9,7 +9,7 @@
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_msg.h"
class camera_class;
class camera_process_class;
class daGrid_c;
class daTornado_c;
class daPy_FLG1;
+1 -1
View File
@@ -13,8 +13,8 @@
#include "d/d_spline_path.h"
#include "global.h"
class camera_class;
class camera_process_class;
class camera_class;
class dBgS_LinChk;
class dBgS_CamGndChk;
class d2DBSplinePath;
+7 -2
View File
@@ -2220,8 +2220,13 @@ void dComIfGp_setNextStage(const char* i_stageName, s16 i_point, s8 i_roomNo, s8
dStage_Ship_dt_c* dComIfGp_getShip(int i_roomNo, int param_1);
bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle);
inline camera_class* dComIfGp_getCamera(int idx) { return g_dComIfG_gameInfo.play.getCamera(idx); }
inline f32 dComIfGp_getCamZoomForcus(int idx) { return g_dComIfG_gameInfo.play.getCamZoomForcus(idx); }
inline camera_process_class* dComIfGp_getCamera(int idx) {
return (camera_process_class*)g_dComIfG_gameInfo.play.getCamera(idx);
}
inline f32 dComIfGp_getCamZoomForcus(int idx) {
return g_dComIfG_gameInfo.play.getCamZoomForcus(idx);
}
inline const char* dComIfGp_getStartStageName() {
return g_dComIfG_gameInfo.play.getStartStageName();
+3 -3
View File
@@ -443,7 +443,7 @@ public:
struct view_port_class;
struct view_class;
class camera_class;
class camera_process_class;
struct dDlst_alphaModelData_c {
public:
@@ -639,7 +639,7 @@ public:
void setWindow(dDlst_window_c* pWindow) { mpWindow = pWindow; }
void setViewport(view_port_class* pViewPort) { mpViewPort = pViewPort; }
view_port_class* getViewport() { return mpViewPort; }
void setView(view_class* pView) { mpCamera = (camera_class*)pView; }
void setView(view_class* pView) { mpCamera = (camera_process_class*)pView; }
view_class* getView() { return (view_class*)mpCamera; }
static void offWipe() { mWipe = false; }
@@ -690,7 +690,7 @@ public:
/* 0x00228 */ dDlst_base_c** mp2DXluEnd;
/* 0x0022C */ dDlst_window_c* mpWindow;
/* 0x00230 */ view_port_class* mpViewPort;
/* 0x00234 */ camera_class* mpCamera; // should be view_class*
/* 0x00234 */ camera_process_class* mpCamera; // should be view_class*
/* 0x00238 */ u8 field_0x00238[0x00244 - 0x00238];
/* 0x00244 */ dDlst_alphaModel_c* mpAlphaModel;
/* 0x00248 */ dDlst_alphaModel_c* mpSpotModel;