falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CreatePlayerEquipActorMgr

This commit is contained in:
Pistonight 2025-05-03 21:27:10 -07:00
parent 24a4226082
commit 1f50e8fd9c
33 changed files with 877 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-tidy
View File

@ -28,6 +28,7 @@ modernize-*,
-modernize-use-trailing-return-type,
-modernize-avoid-c-arrays,
performance-*,
-performance-enum-size,
-performance-no-int-to-ptr,
-performance-unnecessary-copy-initialization,
readability-*,

70
data/uking_functions.csv
View File

@ -39992,36 +39992,36 @@ Address,Quality,Size,Name
0x0000007100665a84,U,000156,
0x0000007100665b20,U,000068,
0x0000007100665b64,U,000488,
0x0000007100665d4c,W,000100,_ZN4sead10GameConfig18SingletonDisposer_D1Ev
0x0000007100665db0,U,000108,CreatePlayerEquipActorMgr::deleteInstance
0x0000007100665e1c,U,000136,CreatePlayerEquipActorMgr::createInstance
0x0000007100665d4c,O,000100,_ZN5uking3act25CreatePlayerEquipActorMgr18SingletonDisposer_D1Ev
0x0000007100665db0,O,000108,_ZN5uking3act25CreatePlayerEquipActorMgr18SingletonDisposer_D0Ev
0x0000007100665e1c,O,000136,_ZN5uking3act25CreatePlayerEquipActorMgr14createInstanceEPN4sead4HeapE
0x0000007100665ea4,O,000172,_ZN5uking3act15needsArmorHeadBERKN4sead14SafeStringBaseIcEES5_
0x0000007100665f50,U,000088,
0x0000007100665fa8,U,000088,
0x0000007100666000,U,000556,CreatePlayerEquipActorMgr::ctor
0x000000710066622c,U,000152,CreatePlayerEquipActorMgr::dtor
0x00000071006662c4,U,000004,nullsub_2163
0x00000071006662c8,U,000036,
0x00000071006662ec,U,000296,
0x0000007100666414,U,000412,CreatePlayerEquipActorMgr::postCalc
0x00000071006665b0,U,000172,CreatePlayerEquipActorMgr::resetAllEquipmentLoading
0x000000710066665c,U,000140,CreatePlayerEquipActorMgr::resetEquipmentLoading
0x00000071006666e8,U,000272,CreatePlayerEquipActorMgr::playerEquipmentActorsReady
0x00000071006667f8,U,000068,CreatePlayerEquipActorMgr::isEquipmentProcReady
0x000000710066683c,U,000444,CreatePlayerEquipActorMgr::wakeEquipment
0x00000071006669f8,U,000408,CreatePlayerEquipActorMgr::requestCreateWeapon
0x0000007100666b90,U,000360,CreatePlayerEquipActorMgr::requestCreateWeaponCaller
0x0000007100666cf8,U,000688,CreatePlayerEquipActorMgr::requestCreateArmor
0x0000007100666fa8,U,000352,CreatePlayerEquipActorMgr::requestCreateArmorWrap
0x0000007100665f50,O,000088,_ZN5uking3act22isArmorHeadMantleType2ERKN4sead14SafeStringBaseIcEE
0x0000007100665fa8,O,000088,_ZN5uking3act29isArmorUpperNotUseMantleType0ERKN4sead14SafeStringBaseIcEE
0x0000007100666000,O,000556,_ZN5uking3act25CreatePlayerEquipActorMgrC1Ev
0x000000710066622c,O,000152,_ZN5uking3act25CreatePlayerEquipActorMgrD1Ev
0x00000071006662c4,O,000004,_ZN4ksys11StringBoardD2Ev
0x00000071006662c8,O,000036,_ZN5uking3act25CreatePlayerEquipActorMgrD0Ev
0x00000071006662ec,O,000296,_ZN5uking3act25CreatePlayerEquipActorMgr4initEv
0x0000007100666414,m,000412,_ZN5uking3act25CreatePlayerEquipActorMgr8postCalcEv
0x00000071006665b0,O,000172,_ZN5uking3act25CreatePlayerEquipActorMgr8resetAllEv
0x000000710066665c,O,000140,_ZN5uking3act25CreatePlayerEquipActorMgr5resetEi
0x00000071006666e8,m,000272,_ZNK5uking3act25CreatePlayerEquipActorMgr23areAllWeaponActorsReadyEv
0x00000071006667f8,O,000068,_ZNK5uking3act25CreatePlayerEquipActorMgr20isEquipmentProcReadyEi
0x000000710066683c,O,000444,_ZN5uking3act25CreatePlayerEquipActorMgr20tryGetEquipmentActorEi
0x00000071006669f8,O,000408,_ZN5uking3act25CreatePlayerEquipActorMgr21doRequestCreateWeaponEiRKN4sead14SafeStringBaseIcEEiPKNS0_18WeaponModifierInfoES6_
0x0000007100666b90,O,000360,_ZN5uking3act25CreatePlayerEquipActorMgr19requestCreateWeaponERKN4sead14SafeStringBaseIcEEiPKNS0_18WeaponModifierInfoES6_
0x0000007100666cf8,O,000688,_ZN5uking3act25CreatePlayerEquipActorMgr20doRequestCreateArmorEiRKN4sead14SafeStringBaseIcEEiS6_
0x0000007100666fa8,O,000352,_ZN5uking3act25CreatePlayerEquipActorMgr18requestCreateArmorERKN4sead14SafeStringBaseIcEEiS6_
0x0000007100667108,O,000180,_ZN5uking3act25CreatePlayerEquipActorMgr25requestCreateDefaultArmorEiRKN4sead14SafeStringBaseIcEE
0x00000071006671bc,O,000192,_ZN5uking3act25CreatePlayerEquipActorMgr23requestCreateArmorHeadBERKN4sead14SafeStringBaseIcEEiS6_
0x000000710066727c,U,000004,j__ZdlPv_287
0x000000710066727c,O,000004,_ZN4ksys11StringBoardD0Ev
0x0000007100667280,U,000324,
0x00000071006673c4,U,000100,_ZN4sead17PrimitiveRenderer18SingletonDisposer_D1Ev
0x0000007100667428,U,000108,
0x0000007100667494,U,000448,CreatePlayerTrashActorMgr::createInstance
0x0000007100667654,U,000020,_ZN2nn4ui2d7TextBoxD2Ev
0x0000007100667668,U,000052,
0x0000007100667654,U,000020,CreatePlayerTrashActorMgr::dtor
0x0000007100667668,U,000052,CreatePlayerTrashActorMgr::dtor0
0x000000710066769c,U,000300,
0x00000071006677c8,U,000424,CreatePlayerTrashActorMgr::postCalc
0x0000007100667970,U,000004,nullsub_2164
@ -46811,7 +46811,7 @@ Address,Quality,Size,Name
0x000000710073c5b4,U,000732,spawnDroppedInventoryItem
0x000000710073c890,U,000292,
0x000000710073c9b4,U,000600,createActorPickOutFromPorch
0x000000710073cc0c,U,000336,requestCreateWeaponByRawLife
0x000000710073cc0c,O,000336,_ZN5uking3act28requestCreateWeaponByRawLifeEPKcRKN4sead8Matrix34IfEEfPNS3_4HeapEPN4ksys3act14BaseProcHandleEibPKNS0_18WeaponModifierInfoEii
0x000000710073cd5c,U,000160,
0x000000710073cdfc,U,000184,
0x000000710073ceb4,U,000368,requestCreateActorForTreasureChestDrop
@ -61787,9 +61787,9 @@ Address,Quality,Size,Name
0x0000007100aa814c,U,000008,setColorChangeMaterialIndex
0x0000007100aa8154,U,000012,
0x0000007100aa8160,U,000008,
0x0000007100aa8168,O,000048,_ZN5uking3act22getCreateEquipmentSlotENS_2ui13PouchItemTypeE
0x0000007100aa8198,O,000040,_ZN5uking3act16getEquipmentSlotENS0_19CreateEquipmentSlotE
0x0000007100aa81c0,O,000212,_ZN5uking3act23createEquipmentFromItemEPKNS_2ui9PouchItemERKN4sead14SafeStringBaseIcEE
0x0000007100aa8168,O,000048,_ZN5uking2ui22getCreateEquipmentSlotENS0_13PouchItemTypeE
0x0000007100aa8198,O,000040,_ZN5uking2ui16getEquipmentSlotENS_3act19CreateEquipmentSlotE
0x0000007100aa81c0,O,000212,_ZN5uking2ui23createEquipmentFromItemEPKNS0_9PouchItemERKN4sead14SafeStringBaseIcEE
0x0000007100aa8294,U,000028,
0x0000007100aa82b0,U,000132,trashPouchItem
0x0000007100aa8334,U,000028,
@ -72982,7 +72982,7 @@ Address,Quality,Size,Name
0x0000007100d104f0,U,000184,act::acc::Actor::getHomeMtx
0x0000007100d105a8,U,000188,act::acc::Actor::getHomePos
0x0000007100d10664,U,000156,act::acc::Actor::getFieldBodyGroup
0x0000007100d10700,U,000156,act::acc::getActorMtx
0x0000007100d10700,O,000156,_ZN4ksys3act24ActorLinkConstDataAccess11getActorMtxEv
0x0000007100d1079c,O,000004,_ZNK4ksys3act20ActorConstDataAccess8debugLogEiRKN4sead14SafeStringBaseIcEE
0x0000007100d107a0,U,000148,ActorAccessor::getPosition2
0x0000007100d10834,U,000156,act::acc::getPreviousPos2
@ -80965,7 +80965,7 @@ Address,Quality,Size,Name
0x0000007100ef2784,U,000132,
0x0000007100ef2808,U,000204,getRandomWeaponModifier
0x0000007100ef28d4,U,000452,createWeaponND
0x0000007100ef2a98,U,000300,requestCreateActor
0x0000007100ef2a98,O,000300,_ZN4ksys3act10WeaponBase24requestCreateWeaponActorEPKcRKN4sead8Matrix34IfEEfPNS4_4HeapEPNS0_14BaseProcHandleEiPNS0_13InstParamPackEi
0x0000007100ef2bc4,U,000408,WeaponBase::ctor
0x0000007100ef2d5c,U,000180,WeaponBase::m0
0x0000007100ef2e10,U,000180,
@ -81018,7 +81018,7 @@ Address,Quality,Size,Name
0x0000007100ef8668,U,000008,WeaponBase::m208
0x0000007100ef8670,U,000216,WeaponBase::m48
0x0000007100ef8748,U,002512,WeaponBase::m147
0x0000007100ef9118,U,000152,
0x0000007100ef9118,U,000152,WeaponBase::areExtraActorsReady
0x0000007100ef91b0,U,000056,
0x0000007100ef91e8,U,000092,WeaponBase::m230
0x0000007100ef9244,U,000144,WeaponBase::m231
@ -89103,11 +89103,11 @@ Address,Quality,Size,Name
0x00000071010c2924,O,000032,_ZN4ksys4util13TaskQueueLock4lockEPNS0_13TaskQueueBaseE
0x00000071010c2944,O,000112,_ZNK4ksys4util13TaskQueueLock27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
0x00000071010c29b4,O,000092,_ZNK4ksys4util13TaskQueueLock18getRuntimeTypeInfoEv
0x00000071010c2a10,U,000008,
0x00000071010c2a18,U,000004,nullsub_4513
0x00000071010c2a1c,U,000024,
0x00000071010c2a34,U,000020,
0x00000071010c2a48,U,000004,j__ZdlPv_1198
0x00000071010c2a10,O,000008,_ZN4ksys4util11makeTrackerERKN4sead14SafeStringBaseIcEEj
0x00000071010c2a18,O,000004,_ZN4ksys4util11TrackerStub7destroyEv
0x00000071010c2a1c,O,000024,_ZN4ksys4util16TrackerStubScopeC1ENS0_11TrackerStubERKN4sead14SafeStringBaseIcEES7_i
0x00000071010c2a34,O,000020,_ZN4ksys4util16TrackerStubScopeD1Ev
0x00000071010c2a48,O,000004,_ZN4ksys4util16TrackerStubScopeD0Ev
0x00000071010c2a4c,O,000032,_ZN4ksys4util17ManagedTaskHandleC1Ev
0x00000071010c2a6c,O,000128,_ZN4ksys4util17ManagedTaskHandleD1Ev
0x00000071010c2aec,O,000160,_ZN4ksys4util17ManagedTaskHandle19removeTaskFromQueueEv

Can't render this file because it is too large.

2
lib/sead

@ -1 +1 @@
Subproject commit d8b55c018d2249a6c993b2db09620b774015d9d0
Subproject commit 66ab5f8b9c751a1def1aed69fd573cd0bda01739

6
src/Game/Actor/CMakeLists.txt
View File

@ -1,8 +1,10 @@
target_sources(uking PRIVATE
actCreatePlayerEquipActorMgr.cpp
actCreatePlayerEquipActorMgr.h
actDragon.cpp
actDragon.h
actPlayerCreateMgr.cpp
actPlayerCreateMgr.h
actPlayerCreateUtils.cpp
actPlayerCreateUtils.h
actWeapon.cpp
actWeapon.h
)

121
src/Game/Actor/actCreatePlayerEquipActorMgr.cpp
View File

@ -1,121 +0,0 @@
#include "Game/Actor/actCreatePlayerEquipActorMgr.h"
#include <prim/seadStringBuilder.h>
#include "Game/Actor/actWeapon.h"
#include "Game/UI/uiPauseMenuDataMgr.h"
#include "KingSystem/ActorSystem/actInfoCommon.h"
#include "KingSystem/ActorSystem/actInfoData.h"
namespace uking::act {
SEAD_SINGLETON_DISPOSER_IMPL(CreatePlayerEquipActorMgr)
void CreatePlayerEquipActorMgr::requestCreateDefaultArmor(s32 slot,
const sead::SafeString& caller) {
switch (slot) {
case (int)CreateEquipmentSlot::ArmorHead:
doRequestCreateArmor(3, "Armor_Default_Head", -1, caller);
break;
case (int)CreateEquipmentSlot::ArmorUpper:
doRequestCreateArmor(4, "Armor_Default_Upper", -1, caller);
break;
case (int)CreateEquipmentSlot::ArmorLower:
doRequestCreateArmor(5, "Armor_Default_Lower", -1, caller);
break;
default:
break;
}
}
void CreatePlayerEquipActorMgr::requestCreateArmorHeadB(const sead::SafeString& name, int dye_color,
const sead::SafeString& caller) {
sead::FixedStringBuilder<0x40> s;
s.copy(name.cstr());
s.append("_B", -1);
doRequestCreateArmor((int)CreateEquipmentSlot::ArmorHead, s, dye_color, caller);
}
bool needsArmorHeadB(const sead::SafeString& armor_head_name,
const sead::SafeString& armor_upper_name) {
if (armor_upper_name.isEmpty()) {
return false;
}
if (!ksys::act::InfoData::instance() ||
ksys::act::getArmorHeadMantleType(ksys::act::InfoData::instance(),
armor_head_name.cstr()) != 2) {
return false;
}
if (!ksys::act::InfoData::instance() ||
ksys::act::getArmorUpperUseMantleType(ksys::act::InfoData::instance(),
armor_upper_name.cstr()) == 0) {
return false;
}
return true;
}
CreateEquipmentSlot getCreateEquipmentSlot(ui::PouchItemType type) {
switch (type) {
case ui::PouchItemType::Sword:
return CreateEquipmentSlot::WeaponSword;
case ui::PouchItemType::Bow:
return CreateEquipmentSlot::WeaponBow;
case ui::PouchItemType::Shield:
return CreateEquipmentSlot::WeaponShield;
case ui::PouchItemType::ArmorHead:
return CreateEquipmentSlot::ArmorHead;
case ui::PouchItemType::ArmorUpper:
return CreateEquipmentSlot::ArmorUpper;
case ui::PouchItemType::ArmorLower:
return CreateEquipmentSlot::ArmorLower;
default:
return CreateEquipmentSlot::Length;
}
}
ui::EquipmentSlot getEquipmentSlot(CreateEquipmentSlot slot) {
switch (slot) {
case CreateEquipmentSlot::WeaponSword:
return ui::EquipmentSlot::WeaponRight;
case CreateEquipmentSlot::WeaponShield:
return ui::EquipmentSlot::WeaponLeft;
case CreateEquipmentSlot::WeaponBow:
return ui::EquipmentSlot::WeaponBow;
case CreateEquipmentSlot::ArmorHead:
return ui::EquipmentSlot::ArmorHead;
case CreateEquipmentSlot::ArmorUpper:
return ui::EquipmentSlot::ArmorUpper;
case CreateEquipmentSlot::ArmorLower:
return ui::EquipmentSlot::ArmorLower;
default:
return ui::EquipmentSlot::Invalid;
}
}
bool createEquipmentFromItem(const ui::PouchItem* item, const sead::SafeString& caller) {
if (!item) {
return false;
}
auto* mgr = CreatePlayerEquipActorMgr::instance();
if (!mgr) {
return false;
}
auto type = item->getType();
auto slot = getCreateEquipmentSlot(type);
int slot_idx = (int)slot;
if (slot <= CreateEquipmentSlot::WeaponBow) {
WeaponModifierInfo modifier(*item);
mgr->doRequestCreateWeapon(slot_idx, item->getName(), item->getValue(), &modifier, caller);
return true;
}
if (slot <= CreateEquipmentSlot::ArmorLower) {
mgr->doRequestCreateArmor(slot_idx, item->getName(), item->getValue(), caller);
return true;
}
return false;
}
} // namespace uking::act

51
src/Game/Actor/actCreatePlayerEquipActorMgr.h
View File

@ -1,51 +0,0 @@
#pragma once
#include <heap/seadDisposer.h>
#include <prim/seadSafeString.h>
namespace uking::ui {
class PouchItem;
enum class PouchItemType;
enum class EquipmentSlot;
} // namespace uking::ui
namespace uking::act {
struct WeaponModifierInfo;
enum class CreateEquipmentSlot : u8 {
WeaponSword = 0,
WeaponShield = 1,
WeaponBow = 2,
ArmorHead = 3,
ArmorUpper = 4,
ArmorLower = 5,
Length = 6,
};
class CreatePlayerEquipActorMgr {
SEAD_SINGLETON_DISPOSER(CreatePlayerEquipActorMgr)
CreatePlayerEquipActorMgr();
virtual ~CreatePlayerEquipActorMgr();
public:
// TODO 0x71006669F8
void doRequestCreateWeapon(int slot_idx, const sead::SafeString& name, int value,
const WeaponModifierInfo* modifier, const sead::SafeString& caller);
// TODO 0x7100666CF8
void doRequestCreateArmor(int slot_idx, const sead::SafeString& name, int dye_color,
const sead::SafeString& caller);
void requestCreateDefaultArmor(s32 slot_idx, const sead::SafeString& caller);
void requestCreateArmorHeadB(const sead::SafeString& name, int dye_color,
const sead::SafeString& caller);
};
bool needsArmorHeadB(const sead::SafeString& armor_head_name,
const sead::SafeString& armor_upper_name);
CreateEquipmentSlot getCreateEquipmentSlot(ui::PouchItemType type);
ui::EquipmentSlot getEquipmentSlot(CreateEquipmentSlot slot);
bool createEquipmentFromItem(const ui::PouchItem* item, const sead::SafeString& caller);
} // namespace uking::act

312
src/Game/Actor/actPlayerCreateMgr.cpp Normal file
View File

@ -0,0 +1,312 @@
#include "Game/Actor/actPlayerCreateMgr.h"
#include <prim/seadRuntimeTypeInfo.h>
#include <prim/seadStringBuilder.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"
#include "KingSystem/ActorSystem/actActorHeapUtil.h"
#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#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 {
// ==== Stubbed Stuff Start ====
void PlayerCreateDebugStub::init() {
class MsgStub {
public:
MsgStub() = default;
sead::SafeString msg;
u64 unused{};
} stub{};
stub.msg = "読み込み中デバッグボード"; // Loading Debug Board
_0 = 3;
mDebugStatus = "◎読み込み中◎"; // Loading
_18 = 0.9;
_1c = 0;
mColor20 = {1.0f, 1.0f, 1.0f, 1.0f};
mColor30 = {0.2f, 0.2f, 0.2f, 1.0f};
_40.set(1.8, 0);
_48.set(198.638428, 34.742115);
mColor50 = {0.0f, 0.8f, 0.8f, 0.3f};
_60 = 0;
_68 = 0;
_70 = 0;
_78 = {-506.679992, -256.519989, 0};
mColor84 = {0.0f, 0.0f, 0.0f, 1.0f};
}
// ==== Stubbed Stuff End ====
SEAD_SINGLETON_DISPOSER_IMPL(CreatePlayerEquipActorMgr)
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
CreatePlayerEquipActorMgr::CreatePlayerEquipActorMgr() {
mTrackerStub = ksys::util::makeTracker("CreatePlayerEquipActorMgr", 0);
}
CreatePlayerEquipActorMgr::~CreatePlayerEquipActorMgr() {
mTrackerStub.destroy();
}
void CreatePlayerEquipActorMgr::init() {
mDebugStub.init();
}
// NON_MATCHING loop variable
void CreatePlayerEquipActorMgr::postCalc() {
if (mIsLoading.isZero()) {
// nothing is loading
return;
}
for (s32 i = 0; i < mProcHandles.size(); i++) {
if (!isSlotLoading(i)) {
continue;
}
auto& handle = mProcHandles[i];
if (handle.hasProcCreationFailed()) {
handle.isProcCreationCancelled();
handle.deleteProc();
mEntries[i].reset();
mIsLoading.resetBit(i);
continue;
}
if (handle.isProcReady()) {
if (isArmorCreateEquipmentSlot(i)) {
auto* actor = sead::DynamicCast<ksys::act::Actor>(handle.releaseAndWakeProc());
mEntries[i].mProcLink.acquire(actor, false);
}
mEntries[i].mStatus = EntryStatus::Ready;
}
}
}
void CreatePlayerEquipActorMgr::resetAll() {
for (s32 i = 0; i < (s32)CreateEquipmentSlot::Length; ++i) {
reset(i);
}
mIsLoading.makeAllZero();
}
void CreatePlayerEquipActorMgr::reset(s32 slot_idx) {
auto& handle = mProcHandles[slot_idx];
if (handle.isAllocatedOrFailed()) {
handle.deleteProc();
}
mIsLoading.resetBit(slot_idx);
mEntries[slot_idx].reset();
}
// NON_MATCHING reg alloc
bool CreatePlayerEquipActorMgr::areAllWeaponActorsReady() const {
if (mIsLoading.isZero()) {
return true;
}
for (u32 i = 0; i < (u32)CreateEquipmentSlot::Length; ++i) {
if (isSlotLoading((s32)i)) {
return false;
}
auto& handle = mProcHandles[(s32)i];
auto* weapon = sead::DynamicCast<ksys::act::WeaponBase>(handle.getProc());
if (weapon && !weapon->areExtraActorsReady()) {
return false;
}
}
return true;
}
bool CreatePlayerEquipActorMgr::isEquipmentProcReady(s32 slot_idx) const {
const auto& entry = mEntries[slot_idx];
if (entry.mStatus != EntryStatus::Ready) {
return false;
}
const auto& handle = mProcHandles[slot_idx];
if (handle.isAllocatedOrFailed()) {
return handle.isProcReady();
}
return false;
}
ksys::act::Actor* CreatePlayerEquipActorMgr::tryGetEquipmentActor(s32 slot_idx) {
if (mEntries[slot_idx].mStatus != EntryStatus::Ready) {
return nullptr;
}
auto& handle = mProcHandles[slot_idx];
if (handle.isAllocatedOrFailed()) {
if (handle.isProcReady()) {
auto* actor = sead::DynamicCast<ksys::act::Actor>(handle.releaseAndWakeProc());
mEntries[slot_idx].mProcLink.acquire(actor, false);
}
}
auto* actor =
sead::DynamicCast<ksys::act::Actor>(mEntries[slot_idx].mProcLink.getProc(nullptr, nullptr));
mEntries[slot_idx].reset();
return actor;
}
void CreatePlayerEquipActorMgr::doRequestCreateWeapon(s32 slot_idx, const sead::SafeString& name,
int value, const WeaponModifierInfo* modifier,
const sead::SafeString& caller) {
auto scope = ksys::util::TrackerStubScope(mTrackerStub, "requestCreateWeapon", caller, 1);
deleteLoadingProc(slot_idx);
auto* player = ksys::act::PlayerInfo::instance()->getPlayer();
sead::Matrix34f pos;
pos.makeT(player->getMtx().getTranslation());
requestCreateWeaponByRawLife(name.cstr(), pos, 1.0,
ksys::act::ActorHeapUtil::instance()->getBaseProcHeap(),
&mProcHandles[slot_idx], value, false, modifier, 2, 2);
onSlotLoadingRequested(slot_idx, name);
}
void CreatePlayerEquipActorMgr::requestCreateWeapon(const sead::SafeString& name, int value,
const WeaponModifierInfo* modifier,
const sead::SafeString& caller) {
auto scope = ksys::util::TrackerStubScope(mTrackerStub, "requestCreateWeapon", caller, 1);
auto* info_data = ksys::act::InfoData::instance();
if (!info_data) {
return;
}
const char* profile_raw;
if (!info_data->getActorProfile(&profile_raw, name.cstr())) {
return;
}
sead::SafeString profile = profile_raw;
s32 slot_idx = (s32)CreateEquipmentSlot::WeaponSword;
if (profile == "WeaponBow") {
slot_idx = (s32)CreateEquipmentSlot::WeaponBow;
} else if (profile == "WeaponShield") {
slot_idx = (s32)CreateEquipmentSlot::WeaponShield;
}
doRequestCreateWeapon(slot_idx, name, value, modifier, caller);
}
// TODO: initialized in sInitArmorStrings (0x7100E2D0F0)
// find a better place to put these
// NOLINTNEXTLINE(misc-use-internal-linkage) doesn't match with static
sead::SafeString ArmorDyeColor; // "ArmorDyeColor"
// NOLINTNEXTLINE(misc-use-internal-linkage) doesn't match with static
sead::SafeString EnableDynamicColorChange; // "EnableDynamicColorChange"
void CreatePlayerEquipActorMgr::doRequestCreateArmor(s32 slot_idx, const sead::SafeString& name,
int dye_color,
const sead::SafeString& caller) {
auto scope = ksys::util::TrackerStubScope(mTrackerStub, "requestCreateArmor", caller, 1);
deleteLoadingProc(slot_idx);
ksys::act::InstParamPack params;
bool is_dye = ksys::act::InfoData::instance()->hasTag(name.cstr(), ksys::act::tags::ArmorDye);
if (is_dye) {
params->add(dye_color, ArmorDyeColor);
if (ksys::gdt::getFlag_ColorChange_EnablePreview()) {
const auto& name = EnableDynamicColorChange;
params->add(true, name);
}
}
{
ksys::act::ActorConstDataAccess access;
ksys::act::acquireActor(&ksys::act::PlayerInfo::instance()->getPlayerLink(), &access);
sead::Vector3f pos;
access.getActorMtx().getTranslation(pos);
params->addPosition(pos);
params->addResourceLane(2);
ksys::act::ActorCreator::instance()->requestCreateActor(
name.cstr(), ksys::act::ActorHeapUtil::instance()->getBaseProcHeap(),
&mProcHandles[slot_idx], &params, nullptr, 2);
}
onSlotLoadingRequested(slot_idx, name);
}
void CreatePlayerEquipActorMgr::requestCreateArmor(const sead::SafeString& name, int dye_color,
const sead::SafeString& caller) {
auto scope = ksys::util::TrackerStubScope(mTrackerStub, "requestCreateArmor", caller, 1);
auto* info_data = ksys::act::InfoData::instance();
if (!info_data) {
return;
}
const char* profile_raw;
if (!info_data->getActorProfile(&profile_raw, name.cstr())) {
return;
}
sead::SafeString profile = profile_raw;
s32 slot_idx = (s32)CreateEquipmentSlot::ArmorHead;
if (profile == "Armor_Upper") {
slot_idx = (s32)CreateEquipmentSlot::ArmorUpper;
} else if (profile == "Armor_Lower") {
slot_idx = (s32)CreateEquipmentSlot::ArmorLower;
}
doRequestCreateArmor(slot_idx, name, dye_color, caller);
}
void CreatePlayerEquipActorMgr::requestCreateDefaultArmor(s32 slot,
const sead::SafeString& caller) {
switch (slot) {
case (int)CreateEquipmentSlot::ArmorHead:
doRequestCreateArmor(3, "Armor_Default_Head", -1, caller);
break;
case (int)CreateEquipmentSlot::ArmorUpper:
doRequestCreateArmor(4, "Armor_Default_Upper", -1, caller);
break;
case (int)CreateEquipmentSlot::ArmorLower:
doRequestCreateArmor(5, "Armor_Default_Lower", -1, caller);
break;
default:
break;
}
}
void CreatePlayerEquipActorMgr::requestCreateArmorHeadB(const sead::SafeString& name, int dye_color,
const sead::SafeString& caller) {
sead::FixedStringBuilder<0x40> s;
s.copy(name.cstr());
s.append("_B", -1);
doRequestCreateArmor((int)CreateEquipmentSlot::ArmorHead, s, dye_color, caller);
}
bool needsArmorHeadB(const sead::SafeString& armor_head_name,
const sead::SafeString& armor_upper_name) {
if (armor_upper_name.isEmpty()) {
return false;
}
return isArmorHeadMantleType2(armor_head_name) &&
isArmorUpperNotUseMantleType0(armor_upper_name);
}
bool isArmorHeadMantleType2(const sead::SafeString& armor_head_name) {
if (!ksys::act::InfoData::instance()) {
return false;
}
return ksys::act::getArmorHeadMantleType(ksys::act::InfoData::instance(),
armor_head_name.cstr()) == 2;
}
bool isArmorUpperNotUseMantleType0(const sead::SafeString& armor_upper_name) {
if (!ksys::act::InfoData::instance()) {
return false;
}
return ksys::act::getArmorUpperUseMantleType(ksys::act::InfoData::instance(),
armor_upper_name.cstr()) != 0;
}
} // namespace uking::act

165
src/Game/Actor/actPlayerCreateMgr.h Normal file
View File

@ -0,0 +1,165 @@
#pragma once
#include <container/seadSafeArray.h>
#include <gfx/seadColor.h>
#include <heap/seadDisposer.h>
#include <math/seadMatrix.h>
#include <prim/seadBitFlag.h>
#include <prim/seadSafeString.h>
#include <prim/seadStringBuilder.h>
#include "KingSystem/ActorSystem/actBaseProcHandle.h"
#include "KingSystem/ActorSystem/actBaseProcLink.h"
#include "KingSystem/System/StringBoard.h"
#include "KingSystem/Utils/TrackerStub.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::act {
class InstParamPack;
class Actor;
} // namespace ksys::act
namespace uking::ui {
enum class PouchItemType;
enum class EquipmentSlot;
} // namespace uking::ui
namespace uking::act {
struct WeaponModifierInfo;
enum class CreateEquipmentSlot : u8 {
WeaponSword = 0,
WeaponShield = 1,
WeaponBow = 2,
ArmorHead = 3,
ArmorUpper = 4,
ArmorLower = 5,
Length = 6,
};
inline bool isArmorCreateEquipmentSlot(s32 slot) {
return slot == (s32)CreateEquipmentSlot::ArmorHead ||
slot == (s32)CreateEquipmentSlot::ArmorUpper ||
slot == (s32)CreateEquipmentSlot::ArmorLower;
}
// Used in both CreatePlayerEquipActorMgr and CreatePlayerTrashActorMgr,
// but stubbed out other than constructor and init
class PlayerCreateDebugStub {
public:
void init();
private:
s32 _0 = 3;
sead::SafeString mDebugStatus;
f32 _18 = 1;
u32 _1c = 0;
sead::Color4f mColor20 = sead::Color4f::cBlack;
sead::Color4f mColor30 = sead::Color4f::cBlack;
sead::Vector2f _40{0, 0};
sead::Vector2f _48{1, 1};
sead::Color4f mColor50 = sead::Color4f::cBlue;
u64 _60 = 0;
u64 _68 = 0;
u64 _70 = 0;
sead::Vector3f _78{0, 0, 0};
sead::Color4f mColor84 = sead::Color4f::cBlack;
};
KSYS_CHECK_SIZE_NX150(PlayerCreateDebugStub, 0x98);
class CreatePlayerEquipActorMgr {
SEAD_SINGLETON_DISPOSER(CreatePlayerEquipActorMgr)
CreatePlayerEquipActorMgr();
virtual ~CreatePlayerEquipActorMgr();
public:
void init();
void postCalc();
void resetAll();
void reset(s32 slot_idx);
bool areAllWeaponActorsReady() const;
bool isEquipmentProcReady(s32 slot_idx) const;
ksys::act::Actor* tryGetEquipmentActor(s32 slot_idx);
void doRequestCreateWeapon(s32 slot_idx, const sead::SafeString& name, int value,
const WeaponModifierInfo* modifier, const sead::SafeString& caller);
void requestCreateWeapon(const sead::SafeString& name, int value,
const WeaponModifierInfo* modifier, const sead::SafeString& caller);
void doRequestCreateArmor(s32 slot_idx, const sead::SafeString& name, int dye_color,
const sead::SafeString& caller);
void requestCreateArmor(const sead::SafeString& name, int dye_color,
const sead::SafeString& caller);
void requestCreateDefaultArmor(s32 slot_idx, const sead::SafeString& caller);
void requestCreateArmorHeadB(const sead::SafeString& name, int dye_color,
const sead::SafeString& caller);
private:
enum class EntryStatus : s32 { Idle = 0, Loading = 1, Ready = 2 };
template <typename T>
class Slots {
private:
sead::SafeArray<T, (s32)CreateEquipmentSlot::Length> mArray;
public:
T& operator[](s32 idx) { return mArray[idx]; }
const T& operator[](s32 idx) const { return mArray[idx]; }
s32 size() const { return mArray.size(); }
};
class Entry {
friend class CreatePlayerEquipActorMgr;
sead::FixedStringBuilder<64> mActorName;
EntryStatus mStatus = EntryStatus::Idle;
ksys::act::BaseProcLink mProcLink;
void reset() {
mActorName.clear();
mStatus = EntryStatus::Idle;
mProcLink.reset();
}
};
KSYS_CHECK_SIZE_NX150(Entry, 0x68);
bool isSlotLoading(s32 slot_idx) const {
return mIsLoading.isOnBit(slot_idx) && mEntries[slot_idx].mStatus == EntryStatus::Loading;
}
void deleteLoadingProc(s32 slot_idx) {
if (mIsLoading.isOnBit(slot_idx)) {
mProcHandles[slot_idx].deleteProc();
}
}
void onSlotLoadingRequested(s32 slot_idx, const sead::SafeString& name) {
if (mProcHandles[slot_idx].isAllocatedOrFailed()) {
auto& entry = mEntries[slot_idx];
entry.mActorName.copy(name.cstr());
mIsLoading.setBit(slot_idx);
entry.mStatus = EntryStatus::Loading;
}
}
Slots<ksys::act::BaseProcHandle> mProcHandles{};
sead::BitFlag8 mIsLoading;
ksys::util::TrackerStub mTrackerStub;
Slots<Entry> mEntries{};
ksys::StringBoard mStringBoard;
u64 _310 = 0;
PlayerCreateDebugStub mDebugStub;
};
KSYS_CHECK_SIZE_NX150(CreatePlayerEquipActorMgr, 0x3B0);
// TODO
class CreatePlayerTrachActorMgr {};
bool needsArmorHeadB(const sead::SafeString& armor_head_name,
const sead::SafeString& armor_upper_name);
bool isArmorHeadMantleType2(const sead::SafeString& armor_head_name);
bool isArmorUpperNotUseMantleType0(const sead::SafeString& armor_upper_name);
} // namespace uking::act

25
src/Game/Actor/actPlayerCreateUtils.cpp Normal file
View File

@ -0,0 +1,25 @@
#include "Game/Actor/actPlayerCreateUtils.h"
#include "Game/Actor/actPlayerCreateMgr.h"
#include "Game/Actor/actWeapon.h"
#include "Game/UI/uiPauseMenuDataMgr.h"
#include "KingSystem/ActorSystem/Profiles/actWeaponBase.h"
namespace uking::act {
void requestCreateWeaponByRawLife(const char* actor_class, const sead::Matrix34f& matrix, f32 scale,
sead::Heap* heap, ksys::act::BaseProcHandle* handle, s32 life,
bool is_player_put, const WeaponModifierInfo* modifier,
s32 task_lane_id, s32 res_lane_id) {
ksys::act::InstParamPack params;
params->add(is_player_put, "IsPlayerPut");
if (modifier) {
modifier->addModifierParams(params);
}
params->add(true, "IsWeaponCreateByRawLife");
params->addResourceLane(res_lane_id);
ksys::act::WeaponBase::requestCreateWeaponActor(actor_class, matrix, scale, heap, handle, life,
&params, task_lane_id);
}
} // namespace uking::act

28
src/Game/Actor/actPlayerCreateUtils.h Normal file
View File

@ -0,0 +1,28 @@
#pragma once
#include <math/seadMatrix.h>
#include <prim/seadSafeString.h>
namespace sead {
class Heap;
}
namespace ksys::act {
class BaseProcHandle;
class InstParamPack;
} // namespace ksys::act
namespace uking::ui {
class PouchItem;
} // namespace uking::ui
namespace uking::act {
enum class CreateEquipmentSlot : u8;
struct WeaponModifierInfo;
void requestCreateWeaponByRawLife(const char* actor_class, const sead::Matrix34f& matrix, f32 scale,
sead::Heap* heap, ksys::act::BaseProcHandle* handle, s32 life,
bool is_player_put, const WeaponModifierInfo* modifier,
s32 task_lane_id, s32 res_lane_id);
} // namespace uking::act

7
src/Game/UI/uiPauseMenuDataMgr.cpp
View File

@ -4,7 +4,8 @@
#include <limits>
#include <math/seadMathCalcCommon.h>
#include <prim/seadScopedLock.h>
#include "Game/Actor/actCreatePlayerEquipActorMgr.h"
#include "Game/Actor/actPlayerCreateMgr.h"
#include "Game/Actor/actPlayerCreateUtils.h"
#include "Game/Actor/actWeapon.h"
#include "Game/Cooking/cookManager.h"
#include "Game/DLC/aocManager.h"
@ -1481,7 +1482,7 @@ void PauseMenuDataMgr::createPlayerEquipment() {
break;
}
if (item->isInInventory() && item->isEquipped()) {
u64 slot = (u64)act::getCreateEquipmentSlot(type);
u64 slot = (u64)getCreateEquipmentSlot(type);
if (slot < equipment_items.size()) {
equipment_items[slot] = item;
}
@ -1501,7 +1502,7 @@ void PauseMenuDataMgr::createPlayerEquipment() {
for (u64 i = 0; i != equipment_items.size(); slot = s32(++i)) {
if (equipment_items[i]) {
if (!need_head_b || i != (u64)act::CreateEquipmentSlot::ArmorHead) {
act::createEquipmentFromItem(equipment_items[i], Caller);
createEquipmentFromItem(equipment_items[i], Caller);
} else {
create_mgr->requestCreateArmorHeadB(equipment_items[i]->getName(),
equipment_items[i]->getValue(), Caller);

67
src/Game/UI/uiUtils.cpp
View File

@ -1,4 +1,5 @@
#include "Game/UI/uiUtils.h"
#include "Game/Actor/actPlayerCreateMgr.h"
#include "Game/Actor/actWeapon.h"
#include "Game/DLC/aocHardModeManager.h"
#include "Game/Damage/dmgInfoManager.h"
@ -114,4 +115,70 @@ bool isMasterSwordActorName(const sead::SafeString& name) {
return name == "Weapon_Sword_070";
}
act::CreateEquipmentSlot getCreateEquipmentSlot(ui::PouchItemType type) {
switch (type) {
case ui::PouchItemType::Sword:
return act::CreateEquipmentSlot::WeaponSword;
case ui::PouchItemType::Bow:
return act::CreateEquipmentSlot::WeaponBow;
case ui::PouchItemType::Shield:
return act::CreateEquipmentSlot::WeaponShield;
case ui::PouchItemType::ArmorHead:
return act::CreateEquipmentSlot::ArmorHead;
case ui::PouchItemType::ArmorUpper:
return act::CreateEquipmentSlot::ArmorUpper;
case ui::PouchItemType::ArmorLower:
return act::CreateEquipmentSlot::ArmorLower;
default:
return act::CreateEquipmentSlot::Length;
}
}
ui::EquipmentSlot getEquipmentSlot(act::CreateEquipmentSlot slot) {
switch (slot) {
case act::CreateEquipmentSlot::WeaponSword:
return ui::EquipmentSlot::WeaponRight;
case act::CreateEquipmentSlot::WeaponShield:
return ui::EquipmentSlot::WeaponLeft;
case act::CreateEquipmentSlot::WeaponBow:
return ui::EquipmentSlot::WeaponBow;
case act::CreateEquipmentSlot::ArmorHead:
return ui::EquipmentSlot::ArmorHead;
case act::CreateEquipmentSlot::ArmorUpper:
return ui::EquipmentSlot::ArmorUpper;
case act::CreateEquipmentSlot::ArmorLower:
return ui::EquipmentSlot::ArmorLower;
default:
return ui::EquipmentSlot::Invalid;
}
}
bool createEquipmentFromItem(const ui::PouchItem* item, const sead::SafeString& caller) {
if (!item) {
return false;
}
auto* mgr = act::CreatePlayerEquipActorMgr::instance();
if (!mgr) {
return false;
}
auto type = item->getType();
auto slot = getCreateEquipmentSlot(type);
int slot_idx = (int)slot;
if (slot <= act::CreateEquipmentSlot::WeaponBow) {
act::WeaponModifierInfo modifier(*item);
mgr->doRequestCreateWeapon(slot_idx, item->getName(), item->getValue(), &modifier, caller);
return true;
}
if (slot <= act::CreateEquipmentSlot::ArmorLower) {
mgr->doRequestCreateArmor(slot_idx, item->getName(), item->getValue(), caller);
return true;
}
return false;
}
} // namespace uking::ui

10
src/Game/UI/uiUtils.h
View File

@ -3,8 +3,14 @@
#include <prim/seadSafeString.h>
#include "Game/Actor/actWeapon.h"
namespace uking::act {
enum class CreateEquipmentSlot : u8;
}
namespace uking::ui {
enum class EquipmentSlot;
enum class PouchItemType;
class PouchItem;
struct WeaponStats {
@ -47,4 +53,8 @@ int getItemValue(const sead::SafeString& name);
// Do not implement until the location is figured out
void applyScreenFade(float progress);
act::CreateEquipmentSlot getCreateEquipmentSlot(ui::PouchItemType type);
ui::EquipmentSlot getEquipmentSlot(act::CreateEquipmentSlot slot);
bool createEquipmentFromItem(const ui::PouchItem* item, const sead::SafeString& caller);
} // namespace uking::ui

2
src/KingSystem/ActorSystem/CMakeLists.txt
View File

@ -20,6 +20,8 @@ target_sources(uking PRIVATE
Profiles/actPlayerBase.h
Profiles/actRopeBase.cpp
Profiles/actRopeBase.h
Profiles/actWeaponBase.cpp
Profiles/actWeaponBase.h
actActor.cpp
actActor.h

23
src/KingSystem/ActorSystem/Profiles/actWeaponBase.cpp Normal file
View File

@ -0,0 +1,23 @@
#include "KingSystem/ActorSystem/Profiles/actWeaponBase.h"
#include "KingSystem/ActorSystem/actActorCreator.h"
#include "KingSystem/ActorSystem/actInstParamPack.h"
namespace ksys::act {
void WeaponBase::requestCreateWeaponActor(const char* actor, const sead::Matrix34f& matrix,
f32 scale, sead::Heap* heap,
ksys::act::BaseProcHandle* handle, s32 life,
ksys::act::InstParamPack* params_in, s32 task_lane_id) {
ksys::act::InstParamPack params;
if (params_in) {
params = *params_in;
}
ksys::act::ActorCreator::addScale(params, scale);
params->add(life, "Life");
params->addMatrix(matrix);
ksys::act::ActorCreator::instance()->requestCreateActor(actor, heap, handle, &params, nullptr,
task_lane_id);
}
} // namespace ksys::act

21
src/KingSystem/ActorSystem/Profiles/actWeaponBase.h Normal file
View File

@ -0,0 +1,21 @@
#pragma once
#include "KingSystem/ActorSystem/actActor.h"
namespace ksys::act {
class BaseProcHandle;
class InstParamPack;
// TODO
class WeaponBase : public Actor {
public:
bool areExtraActorsReady() const;
static void requestCreateWeaponActor(const char* actor, const sead::Matrix34f& matrix,
f32 scale, sead::Heap* heap,
ksys::act::BaseProcHandle* handle, s32 life,
ksys::act::InstParamPack* params, s32 task_lane_id);
};
} // namespace ksys::act

1
src/KingSystem/ActorSystem/actActorCreator.h
View File

@ -12,7 +12,6 @@
namespace ksys::map {
class MubinIter;
class Object;
;
} // namespace ksys::map
namespace ksys::act {

15
src/KingSystem/ActorSystem/actActorLinkConstDataAccess.cpp
View File

@ -1,4 +1,6 @@
#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#include <prim/seadRuntimeTypeInfo.h>
#include "KingSystem/ActorSystem/actActor.h"
#include "KingSystem/ActorSystem/actBaseProc.h"
#include "KingSystem/ActorSystem/actBaseProcMgr.h"
#include "KingSystem/Utils/Debug.h"
@ -25,6 +27,19 @@ bool ActorLinkConstDataAccess::acquire(BaseProc* proc) {
return proc && proc->acquire(*this);
}
const Actor* ActorLinkConstDataAccess::getActor() const {
if (!mProc)
return nullptr;
return sead::DynamicCast<Actor>(mProc);
}
const sead::Matrix34f& ActorLinkConstDataAccess::getActorMtx() {
const Actor* actor = getActor();
if (actor)
return actor->getMtx();
return sead::Matrix34f::ident;
}
bool acquireProc(ActorLinkConstDataAccess* accessor, BaseProc* proc, const sead::SafeString& from,
s32) {
bool acquired = false;

4
src/KingSystem/ActorSystem/actActorLinkConstDataAccess.h
View File

@ -1,12 +1,14 @@
#pragma once
#include <basis/seadTypes.h>
#include <math/seadMatrix.h>
#include <prim/seadSafeString.h>
namespace ksys {
struct MesTransceiverId;
namespace act {
class Actor;
class BaseProc;
/// Provides read-only access to actor data for safe, multi-threaded access.
@ -37,6 +39,8 @@ public:
bool hasProc() const { return mProc != nullptr; }
const MesTransceiverId* getMessageTransceiverId() const;
const Actor* getActor() const;
const sead::Matrix34f& getActorMtx();
protected:
friend class ActorConstDataAccess;

154
src/KingSystem/ActorSystem/actActorParamMgr.cpp
View File

@ -42,6 +42,7 @@ SEAD_SINGLETON_DISPOSER_IMPL(ActorParamMgr)
using Type = ActorParam::ResourceType;
using User = res::ActorLink::User;
// NOLINTNEXTLINE cppcoreguidelines-pro-type-member-init
ActorParamMgr::ActorParamMgr() = default;
void ActorParamMgr::init(sead::Heap* heap, sead::Heap* debug_heap) {
@ -131,8 +132,7 @@ void ActorParamMgr::init(sead::Heap* heap, sead::Heap* debug_heap) {
req.mEntryFactory = dummy_gparam_factory;
getDummyResHandle(ResType::GParamList)
.load("Actor/GeneralParamList/Dummy.bgparamlist", &req);
if (dummy_gparam_factory)
delete dummy_gparam_factory;
delete dummy_gparam_factory;
auto* modellist = static_cast<res::ModelList*>(
getDummyResHandle(ResType::ModelList).getResourceUnchecked());
@ -191,12 +191,12 @@ ActorParam* ActorParamMgr::getParam(const char* actor_name, ActorParam** out_fre
}
ActorParam* ActorParamMgr::loadParam(const char* actor_name, res::Handle* pack_handle, void* x,
u32 load_req_c) {
u32 res_lane_id) {
bool allocated_new = false;
ActorParam* param = allocParam(actor_name, &allocated_new);
if (allocated_new) {
loadFiles(param, mTempHeap, pack_handle, x, load_req_c);
loadFiles(param, mTempHeap, pack_handle, x, res_lane_id);
param->setEventSignal();
} else {
param->waitForEvent();
@ -206,14 +206,14 @@ ActorParam* ActorParamMgr::loadParam(const char* actor_name, res::Handle* pack_h
}
void ActorParamMgr::loadFiles(ActorParam* param, sead::Heap* heap, res::Handle* pack_handle,
void* x, u32 load_req_c) {
void* x, u32 res_lane_id) {
param->deleteResHandles();
param->allocResHandles(heap, 0, ActorParam::NumResourceTypes + 1);
param->mActiveBufferIdx = 0;
const auto* link =
loadFile<res::ActorLink>(param, Type::ActorLink, "Actor/ActorLink", "xml",
param->getActorName().cstr(), pack_handle, x, load_req_c);
param->getActorName().cstr(), pack_handle, x, res_lane_id);
if (link)
param->setProfileAndPriority(link->getUserName(User::Profile), link->getPriority().cstr());
@ -225,20 +225,20 @@ void ActorParamMgr::loadFiles(ActorParam* param, sead::Heap* heap, res::Handle*
param->mActiveBufferIdx = 0;
loadFile<res::ModelList>(param, Type::ModelList, "Actor/ModelList", "modellist",
actor_link->getUserName(User::Model), pack_handle, x, load_req_c);
actor_link->getUserName(User::Model), pack_handle, x, res_lane_id);
loadFile<res::UMii>(param, Type::UMii, "Actor/UMii", "umii",
actor_link->getUserName(User::UMii), pack_handle, x, load_req_c);
actor_link->getUserName(User::UMii), pack_handle, x, res_lane_id);
loadFile<res::ASList>(param, Type::ASList, "Actor/ASList", "aslist",
actor_link->getUserName(res::ActorLink::User::AS), pack_handle, x,
load_req_c);
res_lane_id);
loadFilesStep2(param, heap, pack_handle, x, load_req_c);
loadFilesStep2(param, heap, pack_handle, x, res_lane_id);
}
bool ActorParamMgr::requestLoadActorPack(res::Handle* handle, const sead::SafeString& actor_name,
u32 load_req_c) {
u32 res_lane_id) {
sead::FixedSafeString<128> path;
res::LoadRequest req;
@ -247,14 +247,14 @@ bool ActorParamMgr::requestLoadActorPack(res::Handle* handle, const sead::SafeSt
path.format("Actor/Pack/%s.bactorpack", actor_name.cstr());
req.mRequester = actor_name;
req._c = load_req_c;
req.mLaneId = res_lane_id;
req._8 = true;
req._28 = false;
return handle->requestLoad(path, &req);
}
ActorParam* ActorParamMgr::loadParamAsync(const char* actor_name, res::Handle* pack_handle,
bool* allocated_new, void* x, u32 load_req_c) {
bool* allocated_new, void* x, u32 res_lane_id) {
auto* param = allocParam(actor_name, allocated_new);
if (!*allocated_new)
return param;
@ -264,7 +264,7 @@ ActorParam* ActorParamMgr::loadParamAsync(const char* actor_name, res::Handle* p
param->mActiveBufferIdx = 0;
loadFileAsync<res::ActorLink>(param, Type::ActorLink, "Actor/ActorLink", "xml",
param->getActorName().cstr(), pack_handle, x, load_req_c);
param->getActorName().cstr(), pack_handle, x, res_lane_id);
return param;
}
@ -272,19 +272,19 @@ template <typename T>
bool ActorParamMgr::loadFileAsync(ActorParam* param, ActorParam::ResourceType type,
const sead::SafeString& dir_name,
const sead::SafeString& extension, const sead::SafeString& name,
res::Handle* pack_handle, void* x, u32 load_req_c) {
res::Handle* pack_handle, void* x, u32 res_lane_id) {
auto* handle = param->allocHandle();
if (name != "Dummy" && !name.isEmpty()) {
sead::FixedSafeString<128> path;
res::LoadRequest req;
prepareLoadFromActorPack(&path, &req, x, dir_name, extension, name, pack_handle, load_req_c,
param->getActorName());
prepareLoadFromActorPack(&path, &req, x, dir_name, extension, name, pack_handle,
res_lane_id, param->getActorName());
return handle->requestLoad(path, &req);
}
if (ActorParam::isValidType(type)) {
auto* res = sead::DynamicCast<T>(mDummyResources[u32(type)].getResource());
auto* res = sead::DynamicCast<T>(mDummyResources[s32(type)].getResource());
param->setResource(type, res);
}
@ -294,13 +294,13 @@ bool ActorParamMgr::loadFileAsync(ActorParam* param, ActorParam::ResourceType ty
// NON_MATCHING: different address calculation for static_cast<ParamIO*>(res)->getPath()
template <typename T>
T* ActorParamMgr::handleAsyncFileLoad(ActorParam* param, s32* idx, ActorParam::ResourceType type,
void*) {
void* _unused) {
const s32 current_idx = *idx;
auto& handle = param->mHandles[param->mActiveBufferIdx][current_idx];
*idx = current_idx + 1;
if (ActorParam::isValidType(type)) {
if (auto* res = static_cast<T*>(param->getRes().mArray[u32(type)]))
if (auto* res = static_cast<T*>(param->getRes().mArray[s32(type)]))
return res;
}
@ -313,7 +313,7 @@ T* ActorParamMgr::handleAsyncFileLoad(ActorParam* param, s32* idx, ActorParam::R
handle.parseResource(nullptr);
if (handle.checkLoadStatus() && type != Type::EventFlow)
param->_a = 1;
param->_a = true;
auto* res = sead::DynamicCast<T>(handle.getResource());
if (res) {
@ -344,72 +344,72 @@ bool ActorParamMgr::finishLoadingActorLink(ActorParam* param, void* x) {
}
void ActorParamMgr::loadParamAsyncStep2(ActorParam* param, res::Handle* pack_handle, void* x,
u32 load_req_c) {
u32 res_lane_id) {
const auto* link = param->getRes().mActorLink;
loadFileAsync<res::ModelList>(param, Type::ModelList, "Actor/ModelList", "modellist",
link->getUsers().getModel(), pack_handle, x, load_req_c);
link->getUsers().getModel(), pack_handle, x, res_lane_id);
loadFileAsync<res::UMii>(param, Type::UMii, "Actor/UMii", "umii", link->getUsers().getUMii(),
pack_handle, x, load_req_c);
pack_handle, x, res_lane_id);
loadFileAsync<res::ASList>(param, Type::ASList, "Actor/ASList", "aslist",
link->getUsers().getAS(), pack_handle, x, load_req_c);
link->getUsers().getAS(), pack_handle, x, res_lane_id);
loadFileAsync<res::AttClientList>(param, Type::AttClientList, "Actor/AttClientList", "atcllist",
link->getUserName(User::Attention), pack_handle, x,
load_req_c);
res_lane_id);
loadFileAsync<res::RagdollConfigList>(param, Type::RagdollConfigList, "Actor/RagdollConfigList",
"rgconfiglist", link->getUserName(User::RgConfigList),
pack_handle, x, load_req_c);
pack_handle, x, res_lane_id);
loadFileAsync<res::AIProgram>(param, Type::AIProgram, "Actor/AIProgram", "aiprog",
link->getUsers().getAIProgram(), pack_handle, x, load_req_c);
link->getUsers().getAIProgram(), pack_handle, x, res_lane_id);
loadFileAsync<res::GParamList>(param, Type::GParamList, "Actor/GeneralParamList", "gparamlist",
link->getUsers().getGParam(), pack_handle, x, load_req_c);
link->getUsers().getGParam(), pack_handle, x, res_lane_id);
loadFileAsync<res::Physics>(param, Type::Physics, "Actor/Physics", "physics",
link->getUsers().getPhysics(), pack_handle, x, load_req_c);
link->getUsers().getPhysics(), pack_handle, x, res_lane_id);
loadFileAsync<res::Chemical>(param, Type::Chemical, "Actor/Chemical", "chemical",
link->getUsers().getChemical(), pack_handle, x, load_req_c);
link->getUsers().getChemical(), pack_handle, x, res_lane_id);
loadFileAsync<res::DamageParam>(param, Type::DamageParam, "Actor/DamageParam", "dmgparam",
link->getUsers().getDamageParam(), pack_handle, x, load_req_c);
link->getUsers().getDamageParam(), pack_handle, x, res_lane_id);
loadFileAsync<res::RagdollBlendWeight>(
param, Type::RagdollBlendWeight, "Actor/RagdollBlendWeight", "rgbw",
link->getUsers().getRgBlendWeight(), pack_handle, x, load_req_c);
link->getUsers().getRgBlendWeight(), pack_handle, x, res_lane_id);
loadFileAsync<res::Awareness>(param, Type::Awareness, "Actor/Awareness", "awareness",
link->getUsers().getAwareness(), pack_handle, x, load_req_c);
link->getUsers().getAwareness(), pack_handle, x, res_lane_id);
loadFileAsync<res::Drop>(param, Type::DropTable, "Actor/DropTable", "drop",
link->getUsers().getDropTable(), pack_handle, x, load_req_c);
link->getUsers().getDropTable(), pack_handle, x, res_lane_id);
loadFileAsync<res::Shop>(param, Type::ShopData, "Actor/ShopData", "shop",
link->getUsers().getShopData(), pack_handle, x, load_req_c);
link->getUsers().getShopData(), pack_handle, x, res_lane_id);
loadFileAsync<res::Recipe>(param, Type::Recipe, "Actor/Recipe", "recipe",
link->getUsers().getRecipe(), pack_handle, x, load_req_c);
link->getUsers().getRecipe(), pack_handle, x, res_lane_id);
loadFileAsync<res::Lod>(param, Type::Lod, "Actor/LOD", "lod", link->getUsers().getLOD(),
pack_handle, x, load_req_c);
pack_handle, x, res_lane_id);
loadFileAsync<res::AISchedule>(param, Type::AISchedule, "Actor/AISchedule", "aischedule",
link->getUsers().getAISchedule(), pack_handle, x, load_req_c);
link->getUsers().getAISchedule(), pack_handle, x, res_lane_id);
loadFileAsync<res::BoneControl>(param, Type::BoneControl, "Actor/BoneControl", "bonectrl",
link->getUsers().getBoneControl(), pack_handle, x, load_req_c);
link->getUsers().getBoneControl(), pack_handle, x, res_lane_id);
loadFileAsync<res::LifeCondition>(param, Type::LifeCondition, "Actor/LifeCondition",
"lifecondition", link->getUsers().getLifeCondition(),
pack_handle, x, load_req_c);
pack_handle, x, res_lane_id);
loadFileAsync<res::AnimInfo>(param, Type::AnimationInfo, "Actor/AnimationInfo", "animinfo",
link->getUsers().getAnimationInfo(), pack_handle, x, load_req_c);
link->getUsers().getAnimationInfo(), pack_handle, x, res_lane_id);
}
bool ActorParamMgr::finishLoadingStep2(ActorParam* param, void* x) {
@ -479,7 +479,7 @@ bool ActorParamMgr::finishLoadingStep2(ActorParam* param, void* x) {
}
void ActorParamMgr::loadExtraResAsync(ActorParam* param, res::Handle* pack_handle, void* x,
u32 load_req_c) {
u32 res_lane_id) {
const auto* aslist = param->getRes().mASList;
const auto* atcllist = param->getRes().mAttClientList;
const auto* rgconfiglist = param->getRes().mRagdollConfigList;
@ -495,7 +495,7 @@ void ActorParamMgr::loadExtraResAsync(ActorParam* param, res::Handle* pack_handl
for (s32 i = 0; i < num_as; ++i) {
loadFileAsync<res::AS>(param, Type::AS, "Actor/AS", "as",
aslist->getASDefines()[i].getFileName(), pack_handle, x,
load_req_c);
res_lane_id);
}
}
@ -503,7 +503,7 @@ void ActorParamMgr::loadExtraResAsync(ActorParam* param, res::Handle* pack_handl
for (s32 i = 0; i < num_att; ++i) {
loadFileAsync<res::AttClient>(param, Type::AttClient, "Actor/AttClient", "atcl",
atcllist->getClients()[i].getFileName(), pack_handle, x,
load_req_c);
res_lane_id);
}
}
@ -511,7 +511,7 @@ void ActorParamMgr::loadExtraResAsync(ActorParam* param, res::Handle* pack_handl
for (s32 i = 0; i < num_rg; ++i) {
loadFileAsync<res::RagdollConfig>(
param, Type::RagdollConfig, "Actor/RagdollConfig", "rgconfig",
rgconfiglist->getImpulseParams()[i].getFileName(), pack_handle, x, load_req_c);
rgconfiglist->getImpulseParams()[i].getFileName(), pack_handle, x, res_lane_id);
}
}
}
@ -627,16 +627,16 @@ void ActorParamMgr::allocExtraResHandles(ActorParam* param, sead::Heap* heap) co
}
void ActorParamMgr::loadFilesStep2(ActorParam* param, sead::Heap* heap, res::Handle* pack_handle,
void* x, u32 load_req_c) {
void* x, u32 res_lane_id) {
const auto* link = param->getRes().mActorLink;
param->mActiveBufferIdx = 0;
loadFile<res::AttClientList>(param, Type::AttClientList, "Actor/AttClientList", "atcllist",
link->getUserName(User::Attention), pack_handle, x, load_req_c);
link->getUserName(User::Attention), pack_handle, x, res_lane_id);
loadFile<res::RagdollConfigList>(param, Type::RagdollConfigList, "Actor/RagdollConfigList",
"rgconfiglist", link->getUserName(User::RgConfigList),
pack_handle, x, load_req_c);
pack_handle, x, res_lane_id);
// Start loading the extra ActorParam files.
allocExtraResHandles(param, heap);
@ -646,7 +646,7 @@ void ActorParamMgr::loadFilesStep2(ActorParam* param, sead::Heap* heap, res::Han
for (s32 i = 0; i < aslist->getASDefines().size(); ++i) {
auto* as = loadFile<res::AS>(param, Type::AS, "Actor/AS", "as",
aslist->getASDefines()[i].getFileName(), pack_handle, x,
load_req_c);
res_lane_id);
if (as) {
as->setIndex(u32(Type::AS));
aslist->addAS_(i, as);
@ -658,7 +658,7 @@ void ActorParamMgr::loadFilesStep2(ActorParam* param, sead::Heap* heap, res::Han
for (s32 i = 0; i < list->getClients().size(); ++i) {
auto* client = loadFile<res::AttClient>(param, Type::AttClient, "Actor/AttClient",
"atcl", list->getClients()[i].getFileName(),
pack_handle, x, load_req_c);
pack_handle, x, res_lane_id);
if (client) {
client->setIndex(u32(Type::AttClient));
list->addClient_(i, client);
@ -670,7 +670,7 @@ void ActorParamMgr::loadFilesStep2(ActorParam* param, sead::Heap* heap, res::Han
for (s32 i = 0; i < list->getImpulseParams().size(); ++i) {
auto* config = loadFile<res::RagdollConfig>(
param, Type::RagdollConfig, "Actor/RagdollConfig", "rgconfig",
list->getImpulseParams()[i].getFileName(), pack_handle, x, load_req_c);
list->getImpulseParams()[i].getFileName(), pack_handle, x, res_lane_id);
if (config) {
config->setIndex(u32(Type::RagdollConfig));
list->addImpulseParamConfig_(i, config);
@ -683,50 +683,50 @@ void ActorParamMgr::loadFilesStep2(ActorParam* param, sead::Heap* heap, res::Han
param->mActiveBufferIdx = 0;
loadFile<res::AIProgram>(param, Type::AIProgram, "Actor/AIProgram", "aiprog",
link->getUsers().getAIProgram(), pack_handle, x, load_req_c);
link->getUsers().getAIProgram(), pack_handle, x, res_lane_id);
loadFile<res::GParamList>(param, Type::GParamList, "Actor/GeneralParamList", "gparamlist",
link->getUsers().getGParam(), pack_handle, x, load_req_c);
link->getUsers().getGParam(), pack_handle, x, res_lane_id);
loadFile<res::Physics>(param, Type::Physics, "Actor/Physics", "physics",
link->getUsers().getPhysics(), pack_handle, x, load_req_c);
link->getUsers().getPhysics(), pack_handle, x, res_lane_id);
loadFile<res::Chemical>(param, Type::Chemical, "Actor/Chemical", "chemical",
link->getUsers().getChemical(), pack_handle, x, load_req_c);
link->getUsers().getChemical(), pack_handle, x, res_lane_id);
loadFile<res::DamageParam>(param, Type::DamageParam, "Actor/DamageParam", "dmgparam",
link->getUsers().getDamageParam(), pack_handle, x, load_req_c);
link->getUsers().getDamageParam(), pack_handle, x, res_lane_id);
loadFile<res::RagdollBlendWeight>(param, Type::RagdollBlendWeight, "Actor/RagdollBlendWeight",
"rgbw", link->getUsers().getRgBlendWeight(), pack_handle, x,
load_req_c);
res_lane_id);
loadFile<res::Awareness>(param, Type::Awareness, "Actor/Awareness", "awareness",
link->getUsers().getAwareness(), pack_handle, x, load_req_c);
link->getUsers().getAwareness(), pack_handle, x, res_lane_id);
loadFile<res::Drop>(param, Type::DropTable, "Actor/DropTable", "drop",
link->getUsers().getDropTable(), pack_handle, x, load_req_c);
link->getUsers().getDropTable(), pack_handle, x, res_lane_id);
loadFile<res::Shop>(param, Type::ShopData, "Actor/ShopData", "shop",
link->getUsers().getShopData(), pack_handle, x, load_req_c);
link->getUsers().getShopData(), pack_handle, x, res_lane_id);
loadFile<res::Recipe>(param, Type::Recipe, "Actor/Recipe", "recipe",
link->getUsers().getRecipe(), pack_handle, x, load_req_c);
link->getUsers().getRecipe(), pack_handle, x, res_lane_id);
loadFile<res::Lod>(param, Type::Lod, "Actor/LOD", "lod", link->getUsers().getLOD(), pack_handle,
x, load_req_c);
x, res_lane_id);
loadFile<res::AISchedule>(param, Type::AISchedule, "Actor/AISchedule", "aischedule",
link->getUsers().getAISchedule(), pack_handle, x, load_req_c);
link->getUsers().getAISchedule(), pack_handle, x, res_lane_id);
loadFile<res::BoneControl>(param, Type::BoneControl, "Actor/BoneControl", "bonectrl",
link->getUsers().getBoneControl(), pack_handle, x, load_req_c);
link->getUsers().getBoneControl(), pack_handle, x, res_lane_id);
loadFile<res::LifeCondition>(param, Type::LifeCondition, "Actor/LifeCondition", "lifecondition",
link->getUsers().getLifeCondition(), pack_handle, x, load_req_c);
link->getUsers().getLifeCondition(), pack_handle, x, res_lane_id);
loadFile<res::AnimInfo>(param, Type::AnimationInfo, "Actor/AnimationInfo", "animinfo",
link->getUsers().getAnimationInfo(), pack_handle, x, load_req_c);
link->getUsers().getAnimationInfo(), pack_handle, x, res_lane_id);
param->_9 = 0;
param->onLoadFinished(this);
@ -741,7 +741,7 @@ bool ActorParamMgr::prepareLoadFromActorPack(sead::BufferedSafeString* path, res
void*, const sead::SafeString& dir_name,
const sead::SafeString& extension,
const sead::SafeString& file_name,
res::Handle* pack_handle, u32 load_req_c,
res::Handle* pack_handle, u32 res_lane_id,
const sead::SafeString& requester) {
path->format("%s/%s.b%s", dir_name.cstr(), file_name.cstr(), extension.cstr());
@ -764,14 +764,14 @@ bool ActorParamMgr::prepareLoadFromActorPack(sead::BufferedSafeString* path, res
req->_24 = false;
}
req->_c = load_req_c;
req->mLaneId = res_lane_id;
req->mRequester = requester;
req->_8 = true;
return ret;
}
res::Archive* ActorParamMgr::loadActorPack(res::Handle* handle, const sead::SafeString& actor_name,
u32 load_req_c) {
u32 res_lane_id) {
sead::FixedSafeString<128> path;
res::TempResourceLoader::LoadArg arg;
arg.retry_on_failure = true;
@ -782,7 +782,7 @@ res::Archive* ActorParamMgr::loadActorPack(res::Handle* handle, const sead::Safe
path.format("Actor/Pack/%s.bactorpack", actor_name.cstr());
arg.load_req.mRequester = actor_name;
arg.load_req._c = load_req_c;
arg.load_req.mLaneId = res_lane_id;
arg.load_req._8 = true;
arg.load_req._28 = false;
arg.load_req.mPath = path;
@ -797,14 +797,14 @@ res::Archive* ActorParamMgr::loadActorPack(res::Handle* handle, const sead::Safe
res::SimpleLoadRequest req;
req.mRequester = "tap::ActorParamMgr";
req.mPath = path;
req._c = 2;
req.mLaneId = 2;
return sead::DynamicCast<res::Archive>(handle->load(path, &req));
}
template <typename T>
T* ActorParamMgr::loadFile(ActorParam* param, ActorParam::ResourceType type, const char* dir_name_c,
const char* extension_c, const char* name_c, res::Handle* pack_handle,
void* x, u32 load_req_c) {
void* x, u32 res_lane_id) {
const sead::SafeString name = name_c;
const sead::SafeString extension = extension_c;
sead::FixedSafeString<128> path;
@ -821,18 +821,18 @@ T* ActorParamMgr::loadFile(ActorParam* param, ActorParam::ResourceType type, con
actor_name = &param->getActorName();
req.mRequester = *actor_name;
req.mPath = path;
req._c = 2;
req.mLaneId = 2;
res = sead::DynamicCast<T>(temp_handle->load(path, &req));
}
// If loading the resource from the RomFS has failed, try to load it from the actor pack.
if (!res) {
if (!pack_handle->isSuccess())
loadActorPack(pack_handle, *actor_name, load_req_c);
loadActorPack(pack_handle, *actor_name, res_lane_id);
res::LoadRequest req;
prepareLoadFromActorPack(&path, &req, x, dir_name_c, extension_c, name_c, pack_handle,
load_req_c, *actor_name);
res_lane_id, *actor_name);
res = sead::DynamicCast<T>(temp_handle->load(path, &req));
if (!res) {
@ -868,7 +868,7 @@ T* ActorParamMgr::loadFile(ActorParam* param, ActorParam::ResourceType type, con
}
if (extension != "fevfl")
param->_a = 1;
param->_a = true;
// Fall back to using the dummy resource.
res = sead::DynamicCast<T>(mDummyResources[s32(type)].getResource());

27
src/KingSystem/ActorSystem/actActorParamMgr.h
View File

@ -43,18 +43,18 @@ public:
ActorParam* allocParam(const char* actor_name, bool* allocated_new);
ActorParam* getParam(const char* actor_name, ActorParam** out_free_param) const;
ActorParam* loadParam(const char* actor_name, res::Handle* pack_handle, void* x,
u32 load_req_c);
u32 res_lane_id);
void unloadParam(ActorParam* param);
bool requestLoadActorPack(res::Handle* handle, const sead::SafeString& actor_name,
u32 load_req_c);
u32 res_lane_id);
ActorParam* loadParamAsync(const char* actor_name, res::Handle* pack_handle,
bool* allocated_new, void* x, u32 load_req_c);
bool* allocated_new, void* x, u32 res_lane_id);
bool finishLoadingActorLink(ActorParam* param, void* x);
void loadParamAsyncStep2(ActorParam* param, res::Handle* pack_handle, void* x, u32 load_req_c);
void loadParamAsyncStep2(ActorParam* param, res::Handle* pack_handle, void* x, u32 res_lane_id);
bool finishLoadingStep2(ActorParam* param, void* x);
void loadExtraResAsync(ActorParam* param, res::Handle* pack_handle, void* x, u32 load_req_c);
void loadExtraResAsync(ActorParam* param, res::Handle* pack_handle, void* x, u32 res_lane_id);
bool finishLoadingExtraRes(ActorParam* param, void* x);
res::GParamList* getDummyGParamList() const;
@ -67,31 +67,32 @@ private:
};
void loadFiles(ActorParam* param, sead::Heap* heap, res::Handle* pack_handle, void* x,
u32 load_req_c);
u32 res_lane_id);
bool prepareLoadFromActorPack(sead::BufferedSafeString* path, res::LoadRequest* req, void* x,
const sead::SafeString& dir_name,
const sead::SafeString& extension,
const sead::SafeString& file_name, res::Handle* pack_handle,
u32 load_req_c, const sead::SafeString& requester);
u32 res_lane_id, const sead::SafeString& requester);
res::Archive* loadActorPack(res::Handle* handle, const sead::SafeString& actor_name,
u32 load_req_c);
u32 res_lane_id);
template <typename T>
T* loadFile(ActorParam* param, ActorParam::ResourceType type, const char* dir_name_c,
const char* extension_c, const char* name_c, res::Handle* pack_handle, void* x,
u32 load_req_c);
u32 res_lane_id);
template <typename T>
bool loadFileAsync(ActorParam* param, ActorParam::ResourceType type,
const sead::SafeString& dir_name, const sead::SafeString& extension,
const sead::SafeString& name, res::Handle* pack_handle, void* x,
u32 load_req_c);
u32 res_lane_id);
template <typename T>
T* handleAsyncFileLoad(ActorParam* param, s32* idx, ActorParam::ResourceType type, void* x);
T* handleAsyncFileLoad(ActorParam* param, s32* idx, ActorParam::ResourceType type,
void* _unused);
void loadFilesStep2(ActorParam* param, sead::Heap* heap, res::Handle* pack_handle, void* x,
u32 load_req_c);
u32 res_lane_id);
void allocExtraResHandles(ActorParam* param, sead::Heap* heap) const;
@ -101,7 +102,7 @@ private:
static constexpr s32 NumParams = 0x400;
sead::TypedBitFlag<Flag> mFlags{};
sead::TypedBitFlag<Flag> mFlags;
ActorParam* mParams = nullptr;
DebugMessage mDebugMessage{"アクタパラメータ"};
void* _e0 = nullptr;

1
src/KingSystem/ActorSystem/actBaseProcHandle.h
View File

@ -26,6 +26,7 @@ public:
bool isProcReady() const;
bool hasProcCreationFailed() const;
bool isProcCreationCancelled() const;
bool isAllocatedOrFailed() const { return mUnit || mFailed; }
void deleteProcIfFailed();
void deleteProc();

1
src/KingSystem/ActorSystem/actInstParamPack.h
View File

@ -147,6 +147,7 @@ public:
InstParamPack() = default;
virtual ~InstParamPack() = default;
InstParamPack& operator=(const InstParamPack& other) = default;
Buffer& getBuffer() { return mBuffer; }
const Buffer& getBuffer() const { return mBuffer; }

1
src/KingSystem/ActorSystem/actPlayerInfo.h
View File

@ -22,6 +22,7 @@ class PlayerInfo : public PlayerInfoBase {
~PlayerInfo() override;
public:
BaseProcLink& getPlayerLink() { return mPlayerLink; }
bool init();
void setAndAcquirePlayer(PlayerBase* player); // requires PlayerOrEnemy and PlayerBase
void resetPlayer(PlayerBase* player);

4
src/KingSystem/Resource/resCache.cpp
View File

@ -118,7 +118,7 @@ Handle::Status Cache::loadResource(const ControlTaskData& data) {
}
u8 lane_id = 0xff;
if (data.mResLoadReq._c <= 2) {
if (data.mResLoadReq.mLaneId <= 2) {
const bool x = result->mStatusFlags.isOn(ResourceUnit::StatusFlag::LoadFromArchive);
#ifdef MATCHING_HACK_NX_CLANG
// This makes absolutely no sense at all, but this prevents InstCombine from
@ -127,7 +127,7 @@ Handle::Status Cache::loadResource(const ControlTaskData& data) {
// so the conditional still works fine.
__builtin_assume(x);
#endif
lane_id = 2 * data.mResLoadReq._c + (x ? 1 : 2);
lane_id = 2 * data.mResLoadReq.mLaneId + (x ? 1 : 2);
}
ResourceUnit::RequestInitLoadArg load_arg;

4
src/KingSystem/Resource/resHandle.cpp
View File

@ -49,9 +49,9 @@ ILoadRequest::~ILoadRequest() {
LoadRequest::LoadRequest() = default;
LoadRequest::LoadRequest(s32 load_data_alignment, u32 arg_c, bool arg_20)
LoadRequest::LoadRequest(s32 load_data_alignment, u32 lane_id, bool arg_20)
: _20(arg_20), mLoadDataAlignment(load_data_alignment) {
_c = arg_c;
mLaneId = lane_id;
}
SimpleLoadRequest::SimpleLoadRequest() = default;

2
src/KingSystem/Resource/resInfoContainer.cpp
View File

@ -33,7 +33,7 @@ bool ResourceInfoContainer::loadResourceSizeTable() {
req._34 = 0;
req.mRequester = "ResourceInfoContainer";
req.mPath = "System/Resource/ResourceSizeTable.product.rsizetable";
req._c = 1;
req.mLaneId = 1;
return sead::DynamicCast<Resource>(mRstbHandle.load(req.mPath, &req));
};

4
src/KingSystem/Resource/resLoadRequest.h
View File

@ -29,7 +29,7 @@ public:
virtual ~ILoadRequest();
bool _8 = false;
u32 _c = 1;
u32 mLaneId = 1;
sead::SafeString mRequester;
};
KSYS_CHECK_SIZE_NX150(ILoadRequest, 0x20);
@ -38,7 +38,7 @@ class LoadRequest : public ILoadRequest {
SEAD_RTTI_OVERRIDE(LoadRequest, ILoadRequest)
public:
LoadRequest();
LoadRequest(s32 load_data_alignment, u32 arg_c, bool arg_20);
LoadRequest(s32 load_data_alignment, u32 lane_id, bool arg_20);
LoadRequest(const LoadRequest&) = default;
LoadRequest& operator=(const LoadRequest&) = default;
~LoadRequest() override = default;

2
src/KingSystem/Resource/resUnit.cpp
View File

@ -48,7 +48,7 @@ bool ResourceUnit::init(const ResourceUnit::InitArg& arg) {
SimplePackedLoadRequest request;
request._8 = true;
request.mRequester = "ResourceUnit";
request._c = 2;
request.mLaneId = 2;
request.mPack = arg.load_req->mPackHandle;
mArchiveRes = sead::DynamicCast<sead::ArchiveRes>(mArchiveResHandle.load("", &request));
}

4
src/KingSystem/System/UI/LayoutResourceMgr.cpp
View File

@ -179,7 +179,7 @@ void LayoutResourceMgr::loadTitleLayout(sead::Heap* heap) {
req.mLoadDataAlignment = 0x1000;
req._22 = false;
req._26 = false;
req._c = 2;
req.mLaneId = 2;
res::Handle::Status status = res::Handle::Status::NoFile;
mTitleLayout.getHandle()->requestLoad("Layout/Title.blarc", &req, &status);
@ -207,7 +207,7 @@ bool LayoutResourceMgr::loadHorseLayout(sead::Heap* heap) {
req.mLoadDataAlignment = 0x1000;
req._22 = false;
req._26 = true;
req._c = 2;
req.mLaneId = 2;
res::Handle::Status status = res::Handle::Status::NoFile;
mHorseLayout.getHandle()->requestLoad("Layout/Horse.blarc", &req, &status);

2
src/KingSystem/Utils/CMakeLists.txt
View File

@ -82,6 +82,8 @@ target_sources(uking PRIVATE
ParamIO.cpp
ParamIO.h
SafeDelete.h
TrackerStub.cpp
TrackerStub.h
TypeTraits.h
Types.h
)

23
src/KingSystem/Utils/TrackerStub.cpp Normal file
View File

@ -0,0 +1,23 @@
#include "KingSystem/Utils/TrackerStub.h"
namespace ksys::util {
TrackerStub makeTracker(const sead::SafeString& name, u32 x) {
return {};
}
void TrackerStub::destroy() {}
TrackerStubScope::TrackerStubScope(TrackerStub tracker, const sead::SafeString& name,
const sead::SafeString& caller, s32 level) {
mTracker = tracker;
}
TrackerStubScope::~TrackerStubScope() {
#ifdef MATCHING_HACK_NX_CLANG
// force D1 to be non-trivial
__builtin_assume(true);
#endif
}
} // namespace ksys::util

31
src/KingSystem/Utils/TrackerStub.h Normal file
View File

@ -0,0 +1,31 @@
#pragma once
#include <prim/seadSafeString.h>
#include "KingSystem/Utils/Types.h"
namespace ksys::util {
// Used in CreatePlayerEquipActorMgr and CreatePlayerTrashActorMgr
class TrackerStub {
public:
void destroy();
private:
u64 _ = 0;
};
KSYS_CHECK_SIZE_NX150(TrackerStub, 0x8);
TrackerStub makeTracker(const sead::SafeString& name, u32 x);
class TrackerStubScope {
public:
TrackerStubScope(TrackerStub tracker, const sead::SafeString& name,
const sead::SafeString& caller, s32 level);
virtual ~TrackerStubScope();
private:
TrackerStub mTracker;
};
KSYS_CHECK_SIZE_NX150(TrackerStubScope, 0x10);
} // namespace ksys::util