From 2ed36c7dc03d7c64c18bcbfaf0e76529874e3a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 16 Jan 2022 11:42:40 +0100 Subject: ksys/phys: Add prerequisites for RigidBody (RigidBodyParam fixes) Seems to have fixed _ZN4ksys4phys11InstanceSet14sub_7100FBB00CEPNS0_9RigidBodyEPNS0_14RigidBodyParamE --- src/KingSystem/Physics/System/physInstanceSet.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/KingSystem/Physics/System/physInstanceSet.cpp') diff --git a/src/KingSystem/Physics/System/physInstanceSet.cpp b/src/KingSystem/Physics/System/physInstanceSet.cpp index 77dfaca1..4f1ecc7c 100644 --- a/src/KingSystem/Physics/System/physInstanceSet.cpp +++ b/src/KingSystem/Physics/System/physInstanceSet.cpp @@ -122,17 +122,16 @@ void* InstanceSet::sub_7100FBAEDC(s32 idx1, s32 idx2) const { return mRigidBodySets[idx1]->getRigidBody(idx2); } -// NON_MATCHING void InstanceSet::sub_7100FBB00C(phys::RigidBody* body, phys::RigidBodyParam* param) { if (body == nullptr) return; phys::RigidBodyInstanceParam instance_params; - param->getParams(&instance_params); + param->makeInstanceParam(&instance_params); if (instance_params.contact_layer == phys::ContactLayer::SensorCustomReceiver) { - body->sub_7100F8F9E8(&instance_params.flags, _188[body->isMassScaling()]); - } else if (instance_params.info_5e0) { - body->sub_7100F8FA44(instance_params.contact_layer, instance_params.info_5e0); + body->sub_7100F8F9E8(&instance_params.receiver_mask, _188[body->isMassScaling()]); + } else if (instance_params.groundhit_mask) { + body->sub_7100F8FA44(instance_params.contact_layer, instance_params.groundhit_mask); } else { body->sub_7100F8F8CC(instance_params.contact_layer, instance_params.groundhit, _188[body->isMassScaling()]); -- cgit v1.2.3