Fix include cycles and useless includes

This commit is contained in:
Léo Lam 2021-03-11 15:10:26 +01:00
parent 9e3975a813
commit 819798cac1
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
7 changed files with 6 additions and 6 deletions

View File

@ -2,8 +2,6 @@
#include <basis/seadTypes.h>
#include "Game/Damage/dmgDamageManagerBase.h"
namespace uking::dmg {
class DamageManagerBase;

View File

@ -1,5 +1,6 @@
#include "Game/Damage/dmgDamageManagerBase.h"
#include "Game/DLC/aoc2.h"
#include "Game/Damage/dmgDamageCallback.h"
#include "KingSystem/ActorSystem/actActor.h"
#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
#include "KingSystem/ActorSystem/actActorParam.h"

View File

@ -5,7 +5,6 @@
#include <heap/seadExpHeap.h>
#include <prim/seadRuntimeTypeInfo.h>
#include "Game/Damage/dmgDamageCallback.h"
#include "Game/Damage/dmgInfoManager.h"
#include "Game/Damage/dmgStruct20.h"
#include "KingSystem/ActorSystem/actBaseProcLink.h"
@ -17,6 +16,8 @@ class ActorParam;
namespace uking::dmg {
class DamageCallback;
// FIXME: Unknown base. This base seems to handle callbacks and messaging, so maybe a shared base?
class DamageManagerBase_UnknownBase1 {
public:

View File

@ -1,4 +1,5 @@
#include "KingSystem/ActorSystem/actBaseProcHandle.h"
#include "KingSystem/ActorSystem/actBaseProcUnit.h"
#include "KingSystem/Utils/InitTimeInfo.h"
namespace ksys::act {

View File

@ -1,7 +1,6 @@
#pragma once
#include <basis/seadTypes.h>
#include "KingSystem/ActorSystem/actBaseProcUnit.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::act {

View File

@ -3,6 +3,7 @@
#include <prim/seadScopedLock.h>
#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#include "KingSystem/ActorSystem/actBaseProc.h"
#include "KingSystem/ActorSystem/actBaseProcHandle.h"
#include "KingSystem/Utils/Debug.h"
namespace ksys::act {
@ -55,4 +56,4 @@ bool BaseProcUnit::isParentHandleDefault() const {
return mHandle == &BaseProcHandle::sDummyHandle;
}
} // namespace ksys::act
} // namespace ksys::act

View File

@ -3,7 +3,6 @@
#include <basis/seadTypes.h>
#include <thread/seadAtomic.h>
#include <thread/seadCriticalSection.h>
#include "KingSystem/ActorSystem/actBaseProcHandle.h"
namespace ksys::act {