summaryrefslogtreecommitdiff
path: root/src/KingSystem/Physics/System/physInstanceSet.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-03-01 19:31:44 +0100
committerLéo Lam <leo@leolam.fr>2022-03-01 19:31:44 +0100
commit6077a63ea632d5d6a8df7a820c153a7e0444f612 (patch)
treee00b705d63abb6d9abaf1a8b222f94767cf396cc /src/KingSystem/Physics/System/physInstanceSet.cpp
parent11dafc6ac301bf8200bebf63ba1a8c0b8507160d (diff)
ksys/phys: Unify ContactPointInfo/CollisionInfo with InstanceSet
Diffstat (limited to 'src/KingSystem/Physics/System/physInstanceSet.cpp')
-rw-r--r--src/KingSystem/Physics/System/physInstanceSet.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/KingSystem/Physics/System/physInstanceSet.cpp b/src/KingSystem/Physics/System/physInstanceSet.cpp
index ccfc3062..6be16311 100644
--- a/src/KingSystem/Physics/System/physInstanceSet.cpp
+++ b/src/KingSystem/Physics/System/physInstanceSet.cpp
@@ -1,5 +1,7 @@
#include "KingSystem/Physics/System/physInstanceSet.h"
#include "KingSystem/Physics/RigidBody/physRigidBodySet.h"
+#include "KingSystem/Physics/System/physCollisionInfo.h"
+#include "KingSystem/Physics/System/physContactPointInfo.h"
#include "KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h"
namespace ksys::phys {
@@ -154,8 +156,8 @@ void* InstanceSet::sub_7100FBBC28(const sead::SafeString& name) const {
s32 InstanceSet::sub_7100FBBC78(const sead::SafeString& name) const {
s32 idx = 0;
- for (auto& info : mContactInfos) {
- if (name == info.mName)
+ for (auto& info : mContactPointInfo) {
+ if (name == info.getName())
return idx;
idx++;
}
@@ -164,8 +166,8 @@ s32 InstanceSet::sub_7100FBBC78(const sead::SafeString& name) const {
s32 InstanceSet::sub_7100FBBD9C(const sead::SafeString& name) const {
s32 idx = 0;
- for (auto& info : mCollisionInfos) {
- if (name == info.mName)
+ for (auto& info : mCollisionInfo) {
+ if (name == info.getName())
return idx;
idx++;
}