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

ksys/act: Add SameGroupActorName getters

This commit is contained in:
Léo Lam 2021-01-05 19:31:28 +01:00
parent b3fa7ae230
commit b9d37afa1c
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/uking_functions.csv
View File

@ -80336,10 +80336,10 @@
0x0000007100ee428c,callGetDemoHandler,36,
0x0000007100ee42b0,callGetDemoHandler2,24,
0x0000007100ee42c8,getStr_AtvKeyActorSaveDataIndex,12,
0x0000007100ee42d4,sub_7100EE42D4,92,
0x0000007100ee4330,act::getSameGroupActorName,84,
0x0000007100ee4384,sub_7100EE4384,144,
0x0000007100ee4414,getSameGroupActorName,172,
0x0000007100ee42d4,sub_7100EE42D4,92,_ZN4ksys3act21getSameGroupActorNameEPN4sead14SafeStringBaseIcEEPNS0_12BaseProcLinkE
0x0000007100ee4330,act::getSameGroupActorName,84,_ZN4ksys3act21getSameGroupActorNameEPN4sead14SafeStringBaseIcEEPNS0_5ActorE
0x0000007100ee4384,sub_7100EE4384,144,_ZN4ksys3act21getSameGroupActorNameEPN4sead14SafeStringBaseIcEERKS3_PN2al9ByamlIterE
0x0000007100ee4414,getSameGroupActorName,172,_ZN4ksys3act21getSameGroupActorNameEPN4sead14SafeStringBaseIcEERKS3_
0x0000007100ee44c0,setCheckWeaponFreeSlotHandlerB,16,
0x0000007100ee44d0,setCheckWeaponFreeSlotHandlerA,16,
0x0000007100ee44e0,callCheckWeaponFreeSlotHandler,40,

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

2
lib/sead

@ -1 +1 @@
Subproject commit d0635a9d2fdcaa6b5b9446de22c6691f05b4adef
Subproject commit f25b28df0aa6d8b7be5f66d697511306d8866545

29
src/KingSystem/ActorSystem/actActorUtil.cpp
View File

@ -525,4 +525,33 @@ bool isAirOctaWoodPlatformDlc(const sead::SafeString& name) {
name == "FldObj_DLC_FlyShield_Wood_A_Snow_02";
}
bool getSameGroupActorName(sead::SafeString* name, BaseProcLink* link) {
return getAccessor(link).getSameGroupActorName(name);
}
bool getSameGroupActorName(sead::SafeString* name, Actor* actor) {
return getAccessor(actor).getSameGroupActorName(name);
}
bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& default_value,
al::ByamlIter* actor_info) {
const sead::SafeString value = InfoData::instance()->getSameGroupActorName(*actor_info);
if (value.isEmpty()) {
*name = default_value;
return false;
}
*name = value;
return true;
}
bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& actor_name) {
const sead::SafeString value = InfoData::instance()->getSameGroupActorName(actor_name.cstr());
if (value.isEmpty()) {
*name = actor_name;
return false;
}
*name = value;
return true;
}
} // namespace ksys::act

6
src/KingSystem/ActorSystem/actActorUtil.h
View File

@ -156,4 +156,10 @@ bool isAirOctaWoodPlatformDlc(const sead::SafeString& name);
const sead::SafeString& getDefaultDropActor();
bool getSameGroupActorName(sead::SafeString* name, BaseProcLink* link);
bool getSameGroupActorName(sead::SafeString* name, Actor* actor);
bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& default_value,
al::ByamlIter* actor_info);
bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& actor_name);
} // namespace ksys::act