Merge pull request #182 from RobbyV2/actor-get-character-controller

Match Actor::getCharacterController

3 files changed, 9 insertions, 1 deletions

diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index 03b34fee..10518633 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -92291,7 +92291,7 @@ Address,Quality,Size,Name
 0x00000071011d77b0,U,000920,Actor::onEnterDelete
 0x00000071011d7b48,U,000092,Actor::preSleep
 0x00000071011d7ba4,U,000092,Actor::preWakeUp
-0x00000071011d7c00,U,000024,_ZN4ksys3act5Actor22getCharacterControllerEv
+0x00000071011d7c00,O,000024,_ZN4ksys3act5Actor22getCharacterControllerEv
 0x00000071011d7c18,U,000056,Actor::getPhysicsMainBody
 0x00000071011d7c50,U,000024,Actor::m45
 0x00000071011d7c68,U,000444,Actor::updateMtxFromPhysics
diff --git a/src/KingSystem/ActorSystem/actActor.cpp b/src/KingSystem/ActorSystem/actActor.cpp
index 8346b964..ec7f3ea1 100644
--- a/src/KingSystem/ActorSystem/actActor.cpp
+++ b/src/KingSystem/ActorSystem/actActor.cpp
@@ -3,6 +3,7 @@
 #include "KingSystem/ActorSystem/actAiRoot.h"
 #include "KingSystem/ActorSystem/actBaseProcLink.h"
 #include "KingSystem/ActorSystem/actBaseProcMgr.h"
+#include "KingSystem/Physics/System/physInstanceSet.h"
 
 namespace ksys::act {
 
@@ -81,4 +82,10 @@ int Actor::handleMessage(const Message& message) {
     }
 }
 
+phys::CharacterController* Actor::getCharacterController() {
+    if (!mPhysics)
+        return nullptr;
+    return mPhysics->getCharacterController();
+}
+
 }  // namespace ksys::act
diff --git a/src/KingSystem/Physics/System/physInstanceSet.h b/src/KingSystem/Physics/System/physInstanceSet.h
index 58e6e138..ed73d68d 100644
--- a/src/KingSystem/Physics/System/physInstanceSet.h
+++ b/src/KingSystem/Physics/System/physInstanceSet.h
@@ -58,6 +58,7 @@ public:
 
     const sead::SafeString& getName() const { return mName; }
     const ParamSet* getParamSet() const { return mParamSet; }
+    CharacterController* getCharacterController() const { return mCharacterController; }
 
     void setFlag2();
     void clothVisibleStuff();