From e36bc464b6fb19e80a1755b469b8a29295d080cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 14 Mar 2021 14:31:09 +0100 Subject: [PATCH] ksys/act: Remove useless include and fix indirect includes --- src/KingSystem/ActorSystem/actAiParam.cpp | 4 ++++ src/KingSystem/ActorSystem/actBaseProc.h | 2 -- src/KingSystem/ActorSystem/actBaseProcInitializer.cpp | 1 + 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 #include #include -#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 #include #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"