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

ksys/act: Fix one matching issue

This commit is contained in:
Léo Lam 2020-11-16 20:44:05 +01:00
parent 9ee0c750f2
commit b0498a15bf
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/uking_functions.csv
View File

@ -73370,7 +73370,7 @@
0x0000007100d2f6f0,ActorInfoData::hasTagByName,232, 0x0000007100d2f6f0,ActorInfoData::hasTagByName,232,
0x0000007100d2f7d8,ActorInfoData::hasTagWithIter,296, 0x0000007100d2f7d8,ActorInfoData::hasTagWithIter,296,
0x0000007100d2f900,ActorInfoData::hasTag,224, 0x0000007100d2f900,ActorInfoData::hasTag,224,
0x0000007100d2f9e0,ActorInfoData::getActorSameGroupActorName,256,_ZNK4ksys3act8InfoData21getSameGroupActorNameEPKc? 0x0000007100d2f9e0,ActorInfoData::getActorSameGroupActorName,256,_ZNK4ksys3act8InfoData21getSameGroupActorNameEPKc
0x0000007100d2fae0,ActorInfoData::__auto1,136, 0x0000007100d2fae0,ActorInfoData::__auto1,136,
0x0000007100d2fb68,ActorInfoData::getTerrainTextures,452, 0x0000007100d2fb68,ActorInfoData::getTerrainTextures,452,
0x0000007100d2fd2c,ActorInfoData::getDrops,228, 0x0000007100d2fd2c,ActorInfoData::getDrops,228,

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

21
src/KingSystem/ActorSystem/actInfoData.cpp
View File

@ -193,19 +193,20 @@ void InfoData::getHomeAreas(const char* actor, HomeAreas& info) const {
} }
} }
// NON_MATCHING: stack
const char* InfoData::getSameGroupActorName(const char* actor) const { const char* InfoData::getSameGroupActorName(const char* actor) const {
al::ByamlIter iter; al::ByamlIter iter;
if (getActorIter(&iter, actor, false)) { return [&] {
al::ByamlHashIter hash_iter{iter.getRootNode()}; if (getActorIter(&iter, actor, false)) {
al::ByamlData data; al::ByamlHashIter hash_iter{iter.getRootNode()};
if (hash_iter.getDataByKey(&data, mSystemSameGroupActorNameIdx)) { al::ByamlData data;
const char* name; if (hash_iter.getDataByKey(&data, mSystemSameGroupActorNameIdx)) {
if (iter.tryConvertString(&name, &data)) const char* name;
return name; if (iter.tryConvertString(&name, &data))
return name;
}
} }
} return sead::SafeString::cEmptyString.cstr();
return sead::SafeString::cEmptyString.cstr(); }();
} }
const char* InfoData::getString(const char* actor, const char* key, const char* InfoData::getString(const char* actor, const char* key,