From e8574384e747677b0488f30276f00dd755cb5564 Mon Sep 17 00:00:00 2001 From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com> Date: Fri, 1 Dec 2023 18:18:16 -0500 Subject: [PATCH] Inlines --- src/d/actor/d_a_race_item.cpp | 4 ++-- src/d/d_a_race_item_static.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index 766b3e763..c63db6cad 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -44,7 +44,7 @@ void daRaceItem_c::set_mtx() { mpModel->setBaseScale(mScale); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); - MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } BOOL daRaceItem_c::Delete() { @@ -186,7 +186,7 @@ BOOL daRaceItem_c::execute() { fopAcM_posMoveF(this, mStts.GetCCMoveP()); mAcch.CrrPos(*dComIfG_Bgsp()); - if(!(field_0x645 & 1) && !fopAcM_checkStatus(this, 0x100000)) { // looks like !checkOffsetPos() but that isn't an inline + if(!(field_0x645 & 1) && !fopAcM_checkHookCarryNow(this)) { // looks like !checkOffsetPos() but that isn't an inline if(mAcch.ChkWaterIn()) { fopAcM_seStart(this, JA_SE_OBJ_FALL_WATER_S, 0); fopAcM_delete(this); diff --git a/src/d/d_a_race_item_static.cpp b/src/d/d_a_race_item_static.cpp index ea59d485d..0613d0a0e 100644 --- a/src/d/d_a_race_item_static.cpp +++ b/src/d/d_a_race_item_static.cpp @@ -127,7 +127,7 @@ BOOL daRaceItem_c::endOffsetPos(f32 param_1, cXyz* param_2, f32 param_3, f32 par BOOL daRaceItem_c::checkOffsetPos() { BOOL ret = true; - if(field_0x645 & 0x1 || fopAcM_checkStatus(this, 0x100000)) { + if(field_0x645 & 0x1 || fopAcM_checkHookCarryNow(this)) { ret = false; } @@ -138,6 +138,6 @@ void daRaceItem_c::set_mtx(cXyz* param_1) { mpModel->setBaseScale(mScale); mDoMtx_stack_c::transS(*param_1); mDoMtx_stack_c::YrotM(current.angle.y); - MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); }