From c4c7c00e85df3137d57cc899302a160ff94fa71b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 28 Sep 2026 03:39:31 +0200 Subject: aoc: Manager is ksys, the DLC managers stay game-side aoc::Manager is created during engine start-up and called by gdt, map and StarterPackMgr; only game code uses HardModeManager and ChampionBalladManager. (AI assisted using Claude Fable 5.1 and Claude Opus 5.5) --- src/Game/UI/uiPauseMenuDataMgr.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/Game/UI/uiPauseMenuDataMgr.cpp') diff --git a/src/Game/UI/uiPauseMenuDataMgr.cpp b/src/Game/UI/uiPauseMenuDataMgr.cpp index 53a87310..ec352d31 100644 --- a/src/Game/UI/uiPauseMenuDataMgr.cpp +++ b/src/Game/UI/uiPauseMenuDataMgr.cpp @@ -10,10 +10,10 @@ #include "Game/Actor/actPlayerCreateUtils.h" #include "Game/Actor/actWeapon.h" #include "Game/Cooking/cookManager.h" -#include "Game/DLC/aocManager.h" #include "Game/Scene/gameScene.h" #include "Game/UI/uiUtils.h" #include "Game/gameItemUtils.h" +#include "KingSystem/AOC/aocManager.h" #include "KingSystem/ActorSystem/actActorConstDataAccess.h" #include "KingSystem/ActorSystem/actActorHeapUtil.h" #include "KingSystem/ActorSystem/actActorUtil.h" @@ -450,7 +450,7 @@ void PauseMenuDataMgr::doLoadFromGameData() { } // Add the Travel Medallion (Obj_WarpDLC) to the inventory if it is missing for some reason - if (aoc::Manager::instance()->hasAoc2() && + if (ksys::aoc::Manager::instance()->hasAoc2() && !(found_travel_medallion | !gdt::getFlag_IsGet_Obj_WarpDLC())) { addToPouch(sValues.Obj_WarpDLC.cstr(), PouchItemType::KeyItem, lists, 1, false, nullptr, true); @@ -986,12 +986,12 @@ void PauseMenuDataMgr::doAddToPouch(PouchItemType type, const sead::SafeString& } if (item_name_to_add == sValues.Obj_WarpDLC) { - if (!aoc::Manager::instance()->hasAoc2()) { + if (!ksys::aoc::Manager::instance()->hasAoc2()) { return; } } - if (!aoc::Manager::instance()->hasAoc3()) { + if (!ksys::aoc::Manager::instance()->hasAoc3()) { if (item_name_to_add == sValues.Obj_DLC_HeroSoul_Zora) { item_name_to_add = sValues.Obj_HeroSoul_Zora; } else if (item_name_to_add == sValues.Obj_DLC_HeroSoul_Rito) { @@ -2621,23 +2621,26 @@ bool PauseMenuDataMgr::isHeroSoulEnabled(const sead::SafeString& name) const { // NOLINTNEXTLINE(readability-convert-member-functions-to-static) bool PauseMenuDataMgr::hasRitoSoulPlus() const { - return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Rito() && aoc::Manager::instance()->hasAoc3(); + return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Rito() && + ksys::aoc::Manager::instance()->hasAoc3(); } // NOLINTNEXTLINE(readability-convert-member-functions-to-static) bool PauseMenuDataMgr::hasGoronSoulPlus() const { - return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Goron() && aoc::Manager::instance()->hasAoc3(); + return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Goron() && + ksys::aoc::Manager::instance()->hasAoc3(); } // NOLINTNEXTLINE(readability-convert-member-functions-to-static) bool PauseMenuDataMgr::hasGerudoSoulPlus() const { return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Gerudo() && - aoc::Manager::instance()->hasAoc3(); + ksys::aoc::Manager::instance()->hasAoc3(); } // NOLINTNEXTLINE(readability-convert-member-functions-to-static) bool PauseMenuDataMgr::hasZoraSoulPlus() const { - return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Zora() && aoc::Manager::instance()->hasAoc3(); + return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Zora() && + ksys::aoc::Manager::instance()->hasAoc3(); } int PauseMenuDataMgr::countItemsWithCategoryByType(PouchCategory category) const { -- cgit v1.2.3