summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Game/Actor/Player/CMakeLists.txt9
-rw-r--r--src/Game/Actor/Player/actPlayerBase.cpp1
-rw-r--r--src/Game/Actor/Player/actPlayerBase.h (renamed from src/KingSystem/ActorSystem/Profiles/actPlayerBase.h)6
-rw-r--r--src/Game/Actor/Player/actPlayerInfo.cpp (renamed from src/KingSystem/ActorSystem/actPlayerInfo.cpp)36
-rw-r--r--src/Game/Actor/Player/actPlayerInfo.h (renamed from src/KingSystem/ActorSystem/actPlayerInfo.h)19
-rw-r--r--src/Game/Actor/Player/actPlayerInfoBase.cpp (renamed from src/KingSystem/ActorSystem/actPlayerInfoBase.cpp)6
-rw-r--r--src/Game/Actor/Player/actPlayerInfoStub.cpp (renamed from src/KingSystem/ActorSystem/actPlayerInfoStub.cpp)6
-rw-r--r--src/Game/Actor/Query/queryComparePlayerHeart.cpp4
-rw-r--r--src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp4
-rw-r--r--src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp4
-rw-r--r--src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp4
-rw-r--r--src/Game/Actor/actPlayerCreateMgr.cpp8
-rw-r--r--src/Game/UI/uiPauseMenuDataMgr.cpp10
-rw-r--r--src/KingSystem/ActorSystem/CMakeLists.txt6
-rw-r--r--src/KingSystem/ActorSystem/Profiles/actPlayerBase.cpp1
-rw-r--r--src/KingSystem/System/CMakeLists.txt1
-rw-r--r--src/KingSystem/System/GameConfig.h (renamed from src/KingSystem/Framework/GameConfig.h)4
-rw-r--r--src/KingSystem/System/Patrol.cpp2
-rw-r--r--src/KingSystem/System/StarterPackMgr.h2
19 files changed, 72 insertions, 61 deletions
diff --git a/src/Game/Actor/Player/CMakeLists.txt b/src/Game/Actor/Player/CMakeLists.txt
index 3632c164..f1b9b94e 100644
--- a/src/Game/Actor/Player/CMakeLists.txt
+++ b/src/Game/Actor/Player/CMakeLists.txt
@@ -1,2 +1,11 @@
add_subdirectory(AI)
add_subdirectory(Action)
+
+target_sources(uking PRIVATE
+ actPlayerBase.cpp
+ actPlayerBase.h
+ actPlayerInfo.cpp
+ actPlayerInfo.h
+ actPlayerInfoBase.cpp
+ actPlayerInfoStub.cpp
+)
diff --git a/src/Game/Actor/Player/actPlayerBase.cpp b/src/Game/Actor/Player/actPlayerBase.cpp
new file mode 100644
index 00000000..fcfa6d14
--- /dev/null
+++ b/src/Game/Actor/Player/actPlayerBase.cpp
@@ -0,0 +1 @@
+#include "Game/Actor/Player/actPlayerBase.h"
diff --git a/src/KingSystem/ActorSystem/Profiles/actPlayerBase.h b/src/Game/Actor/Player/actPlayerBase.h
index 4b6e6ec7..8ff7b867 100644
--- a/src/KingSystem/ActorSystem/Profiles/actPlayerBase.h
+++ b/src/Game/Actor/Player/actPlayerBase.h
@@ -3,10 +3,10 @@
#include <prim/seadSafeString.h>
#include "KingSystem/ActorSystem/actActor.h"
-namespace ksys::act {
+namespace uking::act {
// TODO
-class PlayerBase : public Actor {
+class PlayerBase : public ksys::act::Actor {
public:
// FIXME: name for x and name+type for y
void switchEquipment(const sead::SafeString& slot, int frames, int x = -1,
@@ -16,4 +16,4 @@ public:
void setExtraLife(s32 extra_life, f32 x);
};
-} // namespace ksys::act
+} // namespace uking::act
diff --git a/src/KingSystem/ActorSystem/actPlayerInfo.cpp b/src/Game/Actor/Player/actPlayerInfo.cpp
index 5b5b9ca1..ec44523f 100644
--- a/src/KingSystem/ActorSystem/actPlayerInfo.cpp
+++ b/src/Game/Actor/Player/actPlayerInfo.cpp
@@ -1,5 +1,5 @@
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
-#include "KingSystem/ActorSystem/Profiles/actPlayerBase.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerBase.h"
#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#include "KingSystem/ActorSystem/actBaseProc.h"
@@ -7,7 +7,7 @@
#include "KingSystem/GameData/gdtCommonFlagsUtils.h"
#include "KingSystem/ksys.h"
-namespace ksys::act {
+namespace uking::act {
SEAD_SINGLETON_DISPOSER_IMPL(PlayerInfo)
@@ -25,11 +25,11 @@ void PlayerInfo::resetPlayer(PlayerBase* player) {
}
}
-bool PlayerInfo::acquireHorse(BaseProc* horse) {
+bool PlayerInfo::acquireHorse(ksys::act::BaseProc* horse) {
return mHorseLink.acquire(horse, false);
}
-void PlayerInfo::setHorseLink(const BaseProcLink& horse_link) {
+void PlayerInfo::setHorseLink(const ksys::act::BaseProcLink& horse_link) {
mHorseLink = horse_link;
}
@@ -37,7 +37,7 @@ PlayerBase* PlayerInfo::getPlayer() const {
if (!mPlayerActor) {
return nullptr;
}
- BaseProcMgr::instance()->isAccessingProcSafe(mPlayerActor, nullptr);
+ ksys::act::BaseProcMgr::instance()->isAccessingProcSafe(mPlayerActor, nullptr);
return mPlayerActor;
}
@@ -45,7 +45,7 @@ PlayerBase* PlayerInfo::getPlayer_() const {
if (!mPlayerActor) {
return nullptr;
}
- BaseProcMgr::instance()->isAccessingProcSafe(mPlayerActor, nullptr);
+ ksys::act::BaseProcMgr::instance()->isAccessingProcSafe(mPlayerActor, nullptr);
return mPlayerActor;
}
@@ -54,7 +54,7 @@ s32 PlayerInfo::getMaxLifeFromPlayerActor() const {
}
void PlayerInfo::setMaxHeartValue(s32 quarter_hearts) {
- gdt::setFlag_MaxHartValue(quarter_hearts);
+ ksys::gdt::setFlag_MaxHartValue(quarter_hearts);
mMaxHeartValue = static_cast<f32>(quarter_hearts);
}
@@ -64,7 +64,7 @@ u32 PlayerInfo::getMaxHeartValue() const {
}
void PlayerInfo::updateMaxHeartValueFromGameData() {
- mMaxHeartValue = static_cast<f32>(gdt::getFlag_MaxHartValue());
+ mMaxHeartValue = static_cast<f32>(ksys::gdt::getFlag_MaxHartValue());
}
void PlayerInfo::setLifeForPlayerActor(s32 life) {
@@ -86,7 +86,7 @@ void PlayerInfo::recoverLife() {
}
void PlayerInfo::setStaminaCurrentMax(f32 max_stamina) {
- gdt::setFlag_StaminaCurrentMax(max_stamina);
+ ksys::gdt::setFlag_StaminaCurrentMax(max_stamina);
mStaminaCurrentMax = max_stamina;
}
@@ -95,11 +95,11 @@ f32 PlayerInfo::getStaminaCurrentMax() const {
}
void PlayerInfo::updateStaminaCurrentMaxFromGameData() {
- mStaminaCurrentMax = gdt::getFlag_StaminaCurrentMax();
+ mStaminaCurrentMax = ksys::gdt::getFlag_StaminaCurrentMax();
}
void PlayerInfo::setStaminaMax(f32 max_stamina) {
- gdt::setFlag_StaminaMax(max_stamina);
+ ksys::gdt::setFlag_StaminaMax(max_stamina);
mStaminaMax = max_stamina;
}
@@ -108,7 +108,7 @@ f32 PlayerInfo::getStaminaMax() const {
}
void PlayerInfo::updateStaminaMaxFromGameData() {
- mStaminaMax = gdt::getFlag_StaminaMax();
+ mStaminaMax = ksys::gdt::getFlag_StaminaMax();
}
PlayerBase* PlayerInfo::getPlayerUnchecked() {
@@ -116,19 +116,19 @@ PlayerBase* PlayerInfo::getPlayerUnchecked() {
}
sead::Vector3f& PlayerInfo::getPlayerPos() {
- ActorConstDataAccess accessor;
+ ksys::act::ActorConstDataAccess accessor;
- acquireActor(&mPlayerLink, &accessor);
+ ksys::act::acquireActor(&mPlayerLink, &accessor);
accessor.debugLog(1, "getPlayerPos");
return mPlayerPos;
}
sead::Vector3f& PlayerInfo::getPlayerPosForPostCalc() {
- ActorConstDataAccess accessor;
+ ksys::act::ActorConstDataAccess accessor;
- acquireActor(&mPlayerLink, &accessor);
+ ksys::act::acquireActor(&mPlayerLink, &accessor);
accessor.debugLog(0, "getPlayerPosForPostCalc");
return mPlayerPosForPostCalc;
}
-} // namespace ksys::act
+} // namespace uking::act
diff --git a/src/KingSystem/ActorSystem/actPlayerInfo.h b/src/Game/Actor/Player/actPlayerInfo.h
index a47475c9..ee281d58 100644
--- a/src/KingSystem/ActorSystem/actPlayerInfo.h
+++ b/src/Game/Actor/Player/actPlayerInfo.h
@@ -6,8 +6,11 @@
#include "container/seadRingBuffer.h"
namespace ksys::act {
-
class Actor;
+}
+
+namespace uking::act {
+
class PlayerBase;
class PlayerInfoBase {
@@ -22,15 +25,15 @@ class PlayerInfo : public PlayerInfoBase {
~PlayerInfo() override;
public:
- BaseProcLink& getPlayerLink() { return mPlayerLink; }
+ ksys::act::BaseProcLink& getPlayerLink() { return mPlayerLink; }
bool init();
void setAndAcquirePlayer(PlayerBase* player); // requires PlayerOrEnemy and PlayerBase
void resetPlayer(PlayerBase* player);
- bool acquireHorse(BaseProc* horse);
- void setHorseLink(const BaseProcLink& horse_link);
+ bool acquireHorse(ksys::act::BaseProc* horse);
+ void setHorseLink(const ksys::act::BaseProcLink& horse_link);
PlayerBase* getPlayer() const;
PlayerBase* getPlayer_() const; // possibly duped by compiler?
- Actor* getRiddenHorse() const; // requires PlayerBase vtable
+ ksys::act::Actor* getRiddenHorse() const; // requires PlayerBase vtable
void setMaxLifeForPlayerActor(s32 max_heart); // requires PlayerBase
s32 getMaxLifeFromPlayerActor() const;
void setMaxHeartValue(s32 quarter_hearts);
@@ -101,8 +104,8 @@ private:
~Info7() override;
} mInfo7;
PlayerBase* mPlayerActor = nullptr;
- BaseProcLink mPlayerLink;
- BaseProcLink mHorseLink;
+ ksys::act::BaseProcLink mPlayerLink;
+ ksys::act::BaseProcLink mHorseLink;
sead::Vector3f mPlayerPos{0, 0, 0};
sead::Vector3f mPlayerPosForPostCalc{0, 0, 0};
f32 mMaxHeartValue = 0;
@@ -117,4 +120,4 @@ private:
};
KSYS_CHECK_SIZE_NX150(PlayerInfo, 0x3B0);
-} // namespace ksys::act
+} // namespace uking::act
diff --git a/src/KingSystem/ActorSystem/actPlayerInfoBase.cpp b/src/Game/Actor/Player/actPlayerInfoBase.cpp
index dbca9baa..9972fb0f 100644
--- a/src/KingSystem/ActorSystem/actPlayerInfoBase.cpp
+++ b/src/Game/Actor/Player/actPlayerInfoBase.cpp
@@ -1,6 +1,6 @@
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
-namespace ksys::act {
+#include "Game/Actor/Player/actPlayerInfo.h"
+namespace uking::act {
// these are separate from actPlayerInfo.cpp so clang doesn't inline/dedupe them
[[gnu::noinline]] PlayerInfoBase::PlayerInfoBase() = default;
[[gnu::noinline]] PlayerInfoBase::~PlayerInfoBase() = default;
-} // namespace ksys::act
+} // namespace uking::act
diff --git a/src/KingSystem/ActorSystem/actPlayerInfoStub.cpp b/src/Game/Actor/Player/actPlayerInfoStub.cpp
index 2f9dc100..e79c0ea3 100644
--- a/src/KingSystem/ActorSystem/actPlayerInfoStub.cpp
+++ b/src/Game/Actor/Player/actPlayerInfoStub.cpp
@@ -1,5 +1,5 @@
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
-namespace ksys::act {
+#include "Game/Actor/Player/actPlayerInfo.h"
+namespace uking::act {
// these are separate from actPlayerInfo.cpp so clang doesn't inline/dedupe them
PlayerInfo::Info1::Info1() = default;
PlayerInfo::Info1::~Info1() = default;
@@ -16,4 +16,4 @@ PlayerInfo::Info6::~Info6() = default;
PlayerInfo::Info7::Info7() = default;
PlayerInfo::Info7::~Info7() = default;
-} // namespace ksys::act
+} // namespace uking::act
diff --git a/src/Game/Actor/Query/queryComparePlayerHeart.cpp b/src/Game/Actor/Query/queryComparePlayerHeart.cpp
index 9a195f3d..294a46a1 100644
--- a/src/Game/Actor/Query/queryComparePlayerHeart.cpp
+++ b/src/Game/Actor/Query/queryComparePlayerHeart.cpp
@@ -1,6 +1,6 @@
#include "Game/Actor/Query/queryComparePlayerHeart.h"
#include <evfl/Query.h>
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
namespace uking::query {
@@ -9,7 +9,7 @@ ComparePlayerHeart::ComparePlayerHeart(const InitArg& arg) : ksys::act::ai::Quer
ComparePlayerHeart::~ComparePlayerHeart() = default;
int ComparePlayerHeart::doQuery() {
- auto* pi = ksys::act::PlayerInfo::instance();
+ auto* pi = uking::act::PlayerInfo::instance();
if (pi == nullptr)
return 0;
diff --git a/src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp b/src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp
index 8ea31370..d0efd0d3 100644
--- a/src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp
+++ b/src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp
@@ -1,6 +1,6 @@
#include "Game/Actor/Query/queryComparePlayerMaxHeart.h"
#include <evfl/Query.h>
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
namespace uking::query {
@@ -9,7 +9,7 @@ ComparePlayerMaxHeart::ComparePlayerMaxHeart(const InitArg& arg) : ksys::act::ai
ComparePlayerMaxHeart::~ComparePlayerMaxHeart() = default;
int ComparePlayerMaxHeart::doQuery() {
- auto* pi = ksys::act::PlayerInfo::instance();
+ auto* pi = uking::act::PlayerInfo::instance();
if (pi == nullptr)
return 0;
diff --git a/src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp b/src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp
index e4be5a93..4b87abc9 100644
--- a/src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp
+++ b/src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp
@@ -1,6 +1,6 @@
#include "Game/Actor/Query/queryComparePlayerMaxStamina.h"
#include <evfl/Query.h>
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
namespace uking::query {
@@ -9,7 +9,7 @@ ComparePlayerMaxStamina::ComparePlayerMaxStamina(const InitArg& arg) : ksys::act
ComparePlayerMaxStamina::~ComparePlayerMaxStamina() = default;
int ComparePlayerMaxStamina::doQuery() {
- auto* pi = ksys::act::PlayerInfo::instance();
+ auto* pi = uking::act::PlayerInfo::instance();
if (pi == nullptr)
return 0;
diff --git a/src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp b/src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp
index d10be8aa..4bd04ced 100644
--- a/src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp
+++ b/src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp
@@ -1,6 +1,6 @@
#include "Game/Actor/Query/queryComparePlayerOriginalHeart.h"
#include <evfl/Query.h>
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
namespace uking::query {
@@ -10,7 +10,7 @@ ComparePlayerOriginalHeart::ComparePlayerOriginalHeart(const InitArg& arg)
ComparePlayerOriginalHeart::~ComparePlayerOriginalHeart() = default;
int ComparePlayerOriginalHeart::doQuery() {
- using PlayerInfo = ksys::act::PlayerInfo;
+ using PlayerInfo = uking::act::PlayerInfo;
if (PlayerInfo::instance() == nullptr)
return 0;
diff --git a/src/Game/Actor/actPlayerCreateMgr.cpp b/src/Game/Actor/actPlayerCreateMgr.cpp
index f573f245..f053b40d 100644
--- a/src/Game/Actor/actPlayerCreateMgr.cpp
+++ b/src/Game/Actor/actPlayerCreateMgr.cpp
@@ -1,10 +1,11 @@
#include "Game/Actor/actPlayerCreateMgr.h"
#include <prim/seadRuntimeTypeInfo.h>
#include <prim/seadStringBuilder.h>
+#include "Game/Actor/Player/actPlayerBase.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
#include "Game/Actor/actPlayerCreateUtils.h"
#include "Game/Actor/actWeapon.h"
#include "Game/UI/uiPauseMenuDataMgr.h"
-#include "KingSystem/ActorSystem/Profiles/actPlayerBase.h"
#include "KingSystem/ActorSystem/Profiles/actWeaponBase.h"
#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
#include "KingSystem/ActorSystem/actActorCreator.h"
@@ -13,7 +14,6 @@
#include "KingSystem/ActorSystem/actInfoCommon.h"
#include "KingSystem/ActorSystem/actInfoData.h"
#include "KingSystem/ActorSystem/actInstParamPack.h"
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
#include "KingSystem/GameData/gdtCommonFlagsUtils.h"
namespace uking::act {
@@ -154,7 +154,7 @@ void CreatePlayerEquipActorMgr::requestCreateWeapon(s32 slot_idx, const sead::Sa
auto scope = mTracer.trace()->makeScope("requestCreateWeapon", caller, 1);
deleteLoadingProc(slot_idx);
- auto* player = ksys::act::PlayerInfo::instance()->getPlayer();
+ auto* player = PlayerInfo::instance()->getPlayer();
sead::Matrix34f pos;
pos.makeT(player->getMtx().getTranslation());
@@ -213,7 +213,7 @@ void CreatePlayerEquipActorMgr::requestCreateArmor(s32 slot_idx, const sead::Saf
{
ksys::act::ActorConstDataAccess access;
- ksys::act::acquireActor(&ksys::act::PlayerInfo::instance()->getPlayerLink(), &access);
+ ksys::act::acquireActor(&PlayerInfo::instance()->getPlayerLink(), &access);
sead::Vector3f pos;
access.getActorMtx().getTranslation(pos);
params->addPosition(pos);
diff --git a/src/Game/UI/uiPauseMenuDataMgr.cpp b/src/Game/UI/uiPauseMenuDataMgr.cpp
index 87ff35e3..53a87310 100644
--- a/src/Game/UI/uiPauseMenuDataMgr.cpp
+++ b/src/Game/UI/uiPauseMenuDataMgr.cpp
@@ -4,6 +4,8 @@
#include <limits>
#include <math/seadMathCalcCommon.h>
#include <prim/seadScopedLock.h>
+#include "Game/Actor/Player/actPlayerBase.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
#include "Game/Actor/actPlayerCreateMgr.h"
#include "Game/Actor/actPlayerCreateUtils.h"
#include "Game/Actor/actWeapon.h"
@@ -12,14 +14,12 @@
#include "Game/Scene/gameScene.h"
#include "Game/UI/uiUtils.h"
#include "Game/gameItemUtils.h"
-#include "KingSystem/ActorSystem/Profiles/actPlayerBase.h"
#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
#include "KingSystem/ActorSystem/actActorHeapUtil.h"
#include "KingSystem/ActorSystem/actActorUtil.h"
#include "KingSystem/ActorSystem/actBaseProcLink.h"
#include "KingSystem/ActorSystem/actInfoCommon.h"
#include "KingSystem/ActorSystem/actInfoData.h"
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
#include "KingSystem/GameData/gdtCommonFlagsUtils.h"
#include "KingSystem/GameData/gdtManager.h"
#include "KingSystem/GameData/gdtSpecialFlagNames.h"
@@ -315,7 +315,7 @@ void PauseMenuDataMgr::initForNewSave() {
mCanSeeHealthBar = false;
mEquippedWeapons.fill({});
- auto* player = ksys::act::PlayerInfo::instance()->getPlayer();
+ auto* player = uking::act::PlayerInfo::instance()->getPlayer();
if (player) {
player->switchEquipment(getDefaultEquipment(EquipmentSlot::WeaponRight), 1);
player->switchEquipment(getDefaultEquipment(EquipmentSlot::WeaponLeft), 1);
@@ -1357,7 +1357,7 @@ void PauseMenuDataMgr::removeItem(const sead::SafeString& name) {
void PauseMenuDataMgr::removeWeaponIfEquipped(const sead::SafeString& name) {
const auto lock = sead::makeScopedLock(mCritSection);
- if (!ksys::act::PlayerInfo::instance()->getPlayer())
+ if (!uking::act::PlayerInfo::instance()->getPlayer())
return;
const auto& items = getItems();
@@ -1502,7 +1502,7 @@ void PauseMenuDataMgr::createPlayerEquipment() {
}
}
- auto* player = ksys::act::PlayerInfo::instance()->getPlayer();
+ auto* player = uking::act::PlayerInfo::instance()->getPlayer();
s32 slot = 0; // <- this is required to match
for (u64 i = 0; i != equipment_items.size(); slot = s32(++i)) {
diff --git a/src/KingSystem/ActorSystem/CMakeLists.txt b/src/KingSystem/ActorSystem/CMakeLists.txt
index 5a5dd758..dab97a14 100644
--- a/src/KingSystem/ActorSystem/CMakeLists.txt
+++ b/src/KingSystem/ActorSystem/CMakeLists.txt
@@ -16,8 +16,6 @@ target_sources(uking PRIVATE
LOD/actLodState.cpp
LOD/actLodState.h
- Profiles/actPlayerBase.cpp
- Profiles/actPlayerBase.h
Profiles/actRopeBase.cpp
Profiles/actRopeBase.h
Profiles/actWeaponBase.cpp
@@ -116,10 +114,6 @@ target_sources(uking PRIVATE
actPhysicsConstraints.h
actPhysicsUserTag.cpp
actPhysicsUserTag.h
- actPlayerInfo.cpp
- actPlayerInfo.h
- actPlayerInfoBase.cpp
- actPlayerInfoStub.cpp
actTag.h
actionDummyAction.cpp
diff --git a/src/KingSystem/ActorSystem/Profiles/actPlayerBase.cpp b/src/KingSystem/ActorSystem/Profiles/actPlayerBase.cpp
deleted file mode 100644
index abc059cd..00000000
--- a/src/KingSystem/ActorSystem/Profiles/actPlayerBase.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "KingSystem/ActorSystem/Profiles/actPlayerBase.h"
diff --git a/src/KingSystem/System/CMakeLists.txt b/src/KingSystem/System/CMakeLists.txt
index 933fd546..340ab774 100644
--- a/src/KingSystem/System/CMakeLists.txt
+++ b/src/KingSystem/System/CMakeLists.txt
@@ -16,6 +16,7 @@ target_sources(uking PRIVATE
DebugFinder.cpp
DebugFinder.h
DebugMessage.h
+ GameConfig.h
HavokWorkerMgr.cpp
HavokWorkerMgr.h
Hio.cpp
diff --git a/src/KingSystem/Framework/GameConfig.h b/src/KingSystem/System/GameConfig.h
index 1ab9f19a..0c57bbda 100644
--- a/src/KingSystem/Framework/GameConfig.h
+++ b/src/KingSystem/System/GameConfig.h
@@ -2,6 +2,8 @@
#include <prim/seadSafeString.h>
+namespace ksys {
+
class GameConfig {
public:
static GameConfig* getInstance() { return sInstancePtr; }
@@ -15,3 +17,5 @@ public:
private:
static GameConfig* sInstancePtr;
};
+
+} // namespace ksys
diff --git a/src/KingSystem/System/Patrol.cpp b/src/KingSystem/System/Patrol.cpp
index c7fc3be4..19afdecb 100644
--- a/src/KingSystem/System/Patrol.cpp
+++ b/src/KingSystem/System/Patrol.cpp
@@ -1,6 +1,6 @@
#include "KingSystem/System/Patrol.h"
#include <devenv/seadEnvUtil.h>
-#include "KingSystem/Framework/GameConfig.h"
+#include "KingSystem/System/GameConfig.h"
namespace ksys {
diff --git a/src/KingSystem/System/StarterPackMgr.h b/src/KingSystem/System/StarterPackMgr.h
index a0d1214d..a579ac6d 100644
--- a/src/KingSystem/System/StarterPackMgr.h
+++ b/src/KingSystem/System/StarterPackMgr.h
@@ -4,13 +4,13 @@
#include <heap/seadExpHeap.h>
#include <prim/seadSafeString.h>
#include "Game/DLC/aocManager.h"
-#include "KingSystem/Framework/GameConfig.h"
#include "KingSystem/Resource/resEntryFactory.h"
#include "KingSystem/Resource/resHandle.h"
#include "KingSystem/Resource/resLoadRequest.h"
#include "KingSystem/Resource/resResourceArchive.h"
#include "KingSystem/Resource/resResourceMgrTask.h"
#include "KingSystem/Resource/resSystem.h"
+#include "KingSystem/System/GameConfig.h"
#include "KingSystem/System/OverlayArena.h"
#include "KingSystem/Utils/Types.h"
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-02 17:38:08 +0000