From 59cf9a063e1fced05e024a53a2087b771c99eebe Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 28 Oct 2023 16:45:47 -0700 Subject: [PATCH] build fix --- include/SSystem/SComponent/c_bg_s.h | 4 +++- src/d/actor/d_a_arrow.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/SSystem/SComponent/c_bg_s.h b/include/SSystem/SComponent/c_bg_s.h index 10bb3dc00..9a22cc946 100644 --- a/include/SSystem/SComponent/c_bg_s.h +++ b/include/SSystem/SComponent/c_bg_s.h @@ -41,7 +41,9 @@ public: public: cBgS() {} - cM3dGPla* GetTriPla(cBgS_PolyInfo&) const; + cM3dGPla* GetTriPla(cBgS_PolyInfo& polyInfo) const { + return GetTriPla(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex()); + } bool Regist(cBgW*, unsigned int, void*); int Release(cBgW*); bool LineCross(cBgS_LinChk*); diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index c8c795b40..c0330154d 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -683,7 +683,7 @@ BOOL daArrow_c::procMove() { fopAcM_SetParam(this, 2); field_0x604 = 0x28; - dComIfG_Bgsp()->i_GetTriPla(mLinChk); + dComIfG_Bgsp()->GetTriPla(mLinChk); csXyz temp10; temp10.x = cM_atan2s(speed.y, speed.absXZ()); @@ -783,7 +783,7 @@ BOOL daArrow_c::procMove() { fopAcM_OnStatus(this, fopAcStts_UNK4000_e); fopAcM_SetParam(this, 2); field_0x604 = 0x28; - cM3dGPla* triPla = dComIfG_Bgsp()->i_GetTriPla(mLinChk); + cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinChk); csXyz temp10; temp10.x = cM_atan2s(-triPla->mNormal.y, -triPla->mNormal.absXZ()); @@ -892,7 +892,7 @@ BOOL daArrow_c::procReturn() { setBlur(); if (dComIfG_Bgsp()->LineCross(&mLinChk)) { - cM3dGPla* triPla = dComIfG_Bgsp()->i_GetTriPla(mLinChk); + cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinChk); f32 temp2 = speed.abs(); cXyz temp1; C_VECReflect(&speed, &triPla->mNormal, &temp1); @@ -902,7 +902,7 @@ BOOL daArrow_c::procReturn() { s32 temp3 = -field_0x69c; field_0x69c = (temp3 / 2); - triPla = dComIfG_Bgsp()->i_GetTriPla(mLinChk); + triPla = dComIfG_Bgsp()->GetTriPla(mLinChk); if (triPla->mNormal.y >= 0.5f) { field_0x69a = 1; }