mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-08-15 04:33:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

ksys/act: Fix one matching issue

Browse Source
This commit is contained in:
Léo Lam
2020-11-16 20:44:05 +01:00
parent 9ee0c750f2
commit b0498a15bf
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/ActorSystem/actInfoData.cpp
+11 -10
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 {
al::ByamlIter iter;
if (getActorIter(&iter, actor, false)) {
al::ByamlHashIter hash_iter{iter.getRootNode()};
al::ByamlData data;
if (hash_iter.getDataByKey(&data, mSystemSameGroupActorNameIdx)) {
const char* name;
if (iter.tryConvertString(&name, &data))
return name;
return [&] {
if (getActorIter(&iter, actor, false)) {
al::ByamlHashIter hash_iter{iter.getRootNode()};
al::ByamlData data;
if (hash_iter.getDataByKey(&data, mSystemSameGroupActorNameIdx)) {
const char* 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,