summaryrefslogtreecommitdiff
path: root/src/KingSystem
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-03-26 18:44:42 +0100
committerLéo Lam <leo@leolam.fr>2022-03-26 18:44:58 +0100
commitf1398cd0b1f049de1847194f39391eec2c85d1a4 (patch)
tree916d5bd225602296eb2e1ee56635e3e5c177b6fd /src/KingSystem
parent301ad689abbbd7b3adb3a812757fbc558f927502 (diff)
ksys/phys: Merge duplicate definitions of RagdollController
Diffstat (limited to 'src/KingSystem')
-rw-r--r--src/KingSystem/Physics/Ragdoll/physRagdollController.h6
-rw-r--r--src/KingSystem/Physics/System/physInstanceSet.cpp1
-rw-r--r--src/KingSystem/Physics/System/physInstanceSet.h10
3 files changed, 8 insertions, 9 deletions
diff --git a/src/KingSystem/Physics/Ragdoll/physRagdollController.h b/src/KingSystem/Physics/Ragdoll/physRagdollController.h
index c248e046..d9a4ad93 100644
--- a/src/KingSystem/Physics/Ragdoll/physRagdollController.h
+++ b/src/KingSystem/Physics/Ragdoll/physRagdollController.h
@@ -1,11 +1,17 @@
#pragma once
+#include "KingSystem/Physics/physDefines.h"
+
namespace ksys::phys {
// TODO
class RagdollController {
public:
void update();
+
+ u32 sub_7101221CC4();
+ void sub_7101221728(ContactLayer layer);
+ void sub_71012217A8();
};
} // namespace ksys::phys
diff --git a/src/KingSystem/Physics/System/physInstanceSet.cpp b/src/KingSystem/Physics/System/physInstanceSet.cpp
index 37ca09db..08bb59bc 100644
--- a/src/KingSystem/Physics/System/physInstanceSet.cpp
+++ b/src/KingSystem/Physics/System/physInstanceSet.cpp
@@ -1,4 +1,5 @@
#include "KingSystem/Physics/System/physInstanceSet.h"
+#include "KingSystem/Physics/Ragdoll/physRagdollController.h"
#include "KingSystem/Physics/RigidBody/physRigidBodySet.h"
#include "KingSystem/Physics/System/physCollisionInfo.h"
#include "KingSystem/Physics/System/physContactPointInfo.h"
diff --git a/src/KingSystem/Physics/System/physInstanceSet.h b/src/KingSystem/Physics/System/physInstanceSet.h
index 5c78088d..2d1680e5 100644
--- a/src/KingSystem/Physics/System/physInstanceSet.h
+++ b/src/KingSystem/Physics/System/physInstanceSet.h
@@ -21,18 +21,10 @@ namespace ksys::phys {
class CollisionInfo;
class ContactPointInfo;
class ParamSet;
+class RagdollController;
class RigidBodySet;
class SystemGroupHandler;
-class Ragdoll {};
-
-class RagdollController {
-public:
- u32 sub_7101221CC4();
- void sub_7101221728(ContactLayer);
- void sub_71012217A8();
-};
-
class CollisionController {
public:
void sub_7100F5EC30();