summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-07-06 18:16:57 +0200
committerLéo Lam <leo@leolam.fr>2021-07-07 13:56:28 +0200
commitf726f3b68d320da7d3e45a7514e78d6965c4dfed (patch)
treec429b528e083a1f69f886420520dc7f1c7b03988
parenta638e3dba1f8e58b39ba4c443b793d5e2692cd61 (diff)
ksys/act: Add Actor getDummyBaseProcLink()
-rw-r--r--data/uking_functions.csv2
-rw-r--r--src/KingSystem/ActorSystem/actActor.cpp9
-rw-r--r--src/KingSystem/ActorSystem/actActor.h4
3 files changed, 14 insertions, 1 deletions
diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index dfaec21f..30659d4f 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -91935,7 +91935,7 @@
0x00000071011c2d6c,sub_71011C2D6C,96,_ZNK4ksys3act2ai7Actions18updateForPreDeleteEv
0x00000071011c2dcc,sub_71011C2DCC,68,_ZNK4ksys3act2ai7Actions11onPreDeleteEv
0x00000071011c2e10,Dummy::construct,68,
-0x00000071011c2e54,getDummyBaseProcLink,12,
+0x00000071011c2e54,getDummyBaseProcLink,12,_ZN4ksys3act20getDummyBaseProcLinkEv
0x00000071011c2e60,Actor::ctor,1208,
0x00000071011c3318,Actor::job0_1,3008,
0x00000071011c3ed8,Actor::job0_2,324,
diff --git a/src/KingSystem/ActorSystem/actActor.cpp b/src/KingSystem/ActorSystem/actActor.cpp
index ec5da1c3..7d93a0a5 100644
--- a/src/KingSystem/ActorSystem/actActor.cpp
+++ b/src/KingSystem/ActorSystem/actActor.cpp
@@ -1,8 +1,17 @@
#include "KingSystem/ActorSystem/actActor.h"
#include "KingSystem/ActorSystem/actActorParam.h"
+#include "KingSystem/ActorSystem/actBaseProcLink.h"
namespace ksys::act {
+namespace {
+BaseProcLink sDummyBaseProcLink;
+} // namespace
+
+BaseProcLink& getDummyBaseProcLink() {
+ return sDummyBaseProcLink;
+}
+
const sead::SafeString& Actor::getProfile() const {
return mActorParam->getProfile();
}
diff --git a/src/KingSystem/ActorSystem/actActor.h b/src/KingSystem/ActorSystem/actActor.h
index 6b077653..71d5d0f8 100644
--- a/src/KingSystem/ActorSystem/actActor.h
+++ b/src/KingSystem/ActorSystem/actActor.h
@@ -21,6 +21,7 @@ class RootAi;
class LifeRecoverInfo;
class ActorCreator;
class ActorParam;
+class BaseProcLink;
class Actor : public BaseProc {
public:
@@ -111,6 +112,9 @@ protected:
/* 0x7d0 */ u8 TEMP_0x7d0[0x838 - 0x7d0];
};
KSYS_CHECK_SIZE_NX150(Actor, 0x838);
+
+BaseProcLink& getDummyBaseProcLink();
+
} // namespace act
} // namespace ksys