some cleanup of f_pc/f_op files (#2254)

* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work
This commit is contained in:
TakaRikka
2024-11-29 08:24:26 -08:00
committed by GitHub
parent 6482fe7535
commit 073992df8d
903 changed files with 6835 additions and 6587 deletions
+1 -1
View File
@@ -74,7 +74,7 @@ public:
camera_class* iVar1 = dComIfGp_getCamera(0);
cXyz local_28;
current.pos = *fopCamM_GetEye_p(iVar1);
dKyr_get_vectle_calc(&iVar1->mLookat.mEye, &iVar1->mLookat.mCenter, &local_28);
dKyr_get_vectle_calc(&iVar1->lookat.eye, &iVar1->lookat.center, &local_28);
current.angle.y = cM_atan2s(local_28.x, local_28.z);
current.angle.x = -cM_atan2s(
local_28.y, JMAFastSqrt((local_28.x * local_28.x + local_28.z * local_28.z)));
+8 -8
View File
@@ -3393,19 +3393,19 @@ inline void dComIfGp_event_setTalkPartner(fopAc_ac_c* i_actor) {
}
inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
return g_dComIfG_gameInfo.play.getEvent().getPtT();
return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtT();
}
inline fopAc_ac_c* dComIfGp_event_getItemPartner() {
return g_dComIfG_gameInfo.play.getEvent().getPtI();
return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtI();
}
inline fopAc_ac_c* dComIfGp_event_getPt1() {
return g_dComIfG_gameInfo.play.getEvent().getPt1();
return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt1();
}
inline fopAc_ac_c* dComIfGp_event_getPt2() {
return g_dComIfG_gameInfo.play.getEvent().getPt2();
return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt2();
}
inline BOOL dComIfGp_event_runCheck() {
@@ -3897,11 +3897,11 @@ inline view_class* dComIfGd_getView() {
}
inline Mtx44* dComIfGd_getProjViewMtx() {
return &(g_dComIfG_gameInfo.drawlist.getView()->mProjViewMtx);
return &(g_dComIfG_gameInfo.drawlist.getView()->projViewMtx);
}
inline MtxP dComIfGd_getInvViewMtx() {
return g_dComIfG_gameInfo.drawlist.getView()->mInvViewMtx;
return g_dComIfG_gameInfo.drawlist.getView()->invViewMtx;
}
inline view_port_class* dComIfGd_getViewport() {
@@ -3909,10 +3909,10 @@ inline view_port_class* dComIfGd_getViewport() {
}
inline MtxP dComIfGd_getViewRotMtx() {
return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->mViewMtxNoTrans;
return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->viewMtxNoTrans;
}
inline MtxP dComIfGd_getViewMtx() {
return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->mViewMtx;
return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->viewMtx;
}
inline J3DDrawBuffer* dComIfGd_getListFilter() {
+1 -1
View File
@@ -249,7 +249,7 @@ public:
s8 getCameraID() { return mCameraID; }
void setMode(int mode) { mMode = mode; }
view_port_class* getViewPort() { return &mViewport; }
scissor_class* getScissor() { return &mViewport.mScissor; }
scissor_class* getScissor() { return &mViewport.scissor; }
private:
/* 0x00 */ view_port_class mViewport;