From fab3da0e8161d57f6dc3d024f339ebc8eb2c3c2a Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 25 Mar 2024 19:30:25 +0100 Subject: [PATCH] Move `Actors/` to `Actor/` --- include/{Actors => Actor}/Actor.hpp | 0 include/{Actors => Actor}/ActorManager.hpp | 0 include/Actor/ActorNavi.hpp | 3 +++ include/Actors/Navi/Navi.hpp | 3 --- include/Item/ItemManager.hpp | 2 +- include/Player/LinkStateBase.hpp | 4 ++-- include/Player/LinkStateGrab.hpp | 1 + include/Player/PlayerLink.hpp | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) rename include/{Actors => Actor}/Actor.hpp (100%) rename include/{Actors => Actor}/ActorManager.hpp (100%) create mode 100644 include/Actor/ActorNavi.hpp delete mode 100644 include/Actors/Navi/Navi.hpp diff --git a/include/Actors/Actor.hpp b/include/Actor/Actor.hpp similarity index 100% rename from include/Actors/Actor.hpp rename to include/Actor/Actor.hpp diff --git a/include/Actors/ActorManager.hpp b/include/Actor/ActorManager.hpp similarity index 100% rename from include/Actors/ActorManager.hpp rename to include/Actor/ActorManager.hpp diff --git a/include/Actor/ActorNavi.hpp b/include/Actor/ActorNavi.hpp new file mode 100644 index 00000000..36ce860d --- /dev/null +++ b/include/Actor/ActorNavi.hpp @@ -0,0 +1,3 @@ +#pragma once + +class ActorNavi; diff --git a/include/Actors/Navi/Navi.hpp b/include/Actors/Navi/Navi.hpp deleted file mode 100644 index b7c733ee..00000000 --- a/include/Actors/Navi/Navi.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -class Navi; diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index ca0ddad0..c763c488 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -4,7 +4,7 @@ #include "types.h" #include "lib/math.h" -#include "Actors/Navi/Navi.hpp" +#include "Actor/ActorNavi.hpp" #include "Item/Item.hpp" #include "Player/EquipItem.hpp" #include "System/SysNew.hpp" diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp index ad2c5552..3811e6bc 100644 --- a/include/Player/LinkStateBase.hpp +++ b/include/Player/LinkStateBase.hpp @@ -8,8 +8,8 @@ #include "System/SysNew.hpp" #include "Player/PlayerLink.hpp" #include "Player/PlayerControlData.hpp" -#include "Actors/Actor.hpp" -#include "Actors/ActorManager.hpp" +#include "Actor/Actor.hpp" +#include "Actor/ActorManager.hpp" #include "Player/EquipItem.hpp" #include "Debug/DebugHierarchy.hpp" diff --git a/include/Player/LinkStateGrab.hpp b/include/Player/LinkStateGrab.hpp index 3c430a5d..cb95c518 100644 --- a/include/Player/LinkStateGrab.hpp +++ b/include/Player/LinkStateGrab.hpp @@ -7,6 +7,7 @@ #include "Player/LinkStateBase.hpp" #include "Actor/ActorManager.hpp" +#include "Actor/Actor.hpp" class LinkStateGrab : public LinkStateBase { public: diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp index 6d2cbaed..8ba08d44 100644 --- a/include/Player/PlayerLink.hpp +++ b/include/Player/PlayerLink.hpp @@ -7,7 +7,7 @@ #include "Player/PlayerLinkBase.hpp" #include "Player/MotionParams.hpp" -#include "Actors/ActorManager.hpp" +#include "Actor/ActorManager.hpp" #include "Debug/DebugHierarchy.hpp"