This commit is contained in:
SuperDude88
2023-12-01 18:18:16 -05:00
parent 977e87a0dc
commit e8574384e7
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -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);
+2 -2
View File
@@ -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());
}