summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-03-14 14:31:09 +0100
committerLéo Lam <leo@leolam.fr>2021-03-14 14:31:43 +0100
commite36bc464b6fb19e80a1755b469b8a29295d080cc (patch)
tree3434c1eccb2b5cc88888e0d6298c5f925dcdc8c9
parent113cc3bb53cacf51a7beab9c0c0d7056b9358a27 (diff)
ksys/act: Remove useless include and fix indirect includes
-rw-r--r--src/KingSystem/ActorSystem/actAiParam.cpp4
-rw-r--r--src/KingSystem/ActorSystem/actBaseProc.h2
-rw-r--r--src/KingSystem/ActorSystem/actBaseProcInitializer.cpp1
3 files changed, 5 insertions, 2 deletions
diff --git a/src/KingSystem/ActorSystem/actAiParam.cpp b/src/KingSystem/ActorSystem/actAiParam.cpp
index 7edc53bf..c182fce4 100644
--- a/src/KingSystem/ActorSystem/actAiParam.cpp
+++ b/src/KingSystem/ActorSystem/actAiParam.cpp
@@ -1,6 +1,10 @@
#include "KingSystem/ActorSystem/actAiParam.h"
#include "KingSystem/ActorSystem/actActor.h"
+namespace ksys::act {
+class BaseProcHandle;
+}
+
namespace ksys::act::ai {
ParamPack::ParamPack() = default;
diff --git a/src/KingSystem/ActorSystem/actBaseProc.h b/src/KingSystem/ActorSystem/actBaseProc.h
index db4fa76d..9df6427b 100644
--- a/src/KingSystem/ActorSystem/actBaseProc.h
+++ b/src/KingSystem/ActorSystem/actBaseProc.h
@@ -9,7 +9,6 @@
#include <prim/seadSafeString.h>
#include <prim/seadTypedBitFlag.h>
#include <thread/seadAtomic.h>
-#include "KingSystem/ActorSystem/actBaseProcHandle.h"
#include "KingSystem/ActorSystem/actBaseProcJob.h"
#include "KingSystem/ActorSystem/actBaseProcMap.h"
#include "KingSystem/Utils/StrTreeMap.h"
@@ -22,7 +21,6 @@ class BaseProc;
class BaseProcLinkData;
class BaseProcJobHandler;
class BaseProcUnit;
-class BaseProcHandle;
/// Actor base class that encapsulates all the low-level actor lifetime logic.
class BaseProc {
diff --git a/src/KingSystem/ActorSystem/actBaseProcInitializer.cpp b/src/KingSystem/ActorSystem/actBaseProcInitializer.cpp
index c69a009a..da1c33f1 100644
--- a/src/KingSystem/ActorSystem/actBaseProcInitializer.cpp
+++ b/src/KingSystem/ActorSystem/actBaseProcInitializer.cpp
@@ -2,6 +2,7 @@
#include <heap/seadExpHeap.h>
#include <thread/seadThreadUtil.h>
#include "KingSystem/ActorSystem/actBaseProcCreateTask.h"
+#include "KingSystem/ActorSystem/actBaseProcHandle.h"
#include "KingSystem/ActorSystem/actBaseProcMgr.h"
#include "KingSystem/Map/mapObject.h"
#include "KingSystem/Resource/resGameResourceSystem.h"