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

ksys/act: Fix missing parameter for InfoData::getStringByKey 

Callers in actInfoData.cpp still matched because LLVM detected that the
last argument is unused and optimized it out (or inlined the function
entirely)
This commit is contained in:
Léo Lam 2021-01-22 16:33:50 +01:00
parent 5d36832608
commit ad95be2d08
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/uking_functions.csv
View File

@ -73367,7 +73367,7 @@
0x0000007100d2e950,ActorInfoData::isNotMergedGrudgeOrArmor50OrWeaponSwordDemoCheck,348,_ZNK4ksys3act8InfoData10logFailureERKN4sead14SafeStringBaseIcEE
0x0000007100d2eaac,ActorInfoData::x,1484,_ZNK4ksys3act8InfoData13getRecipeInfoEPKcRNS1_10RecipeInfoE
0x0000007100d2f078,act::getActorInfoInt,56,_ZN4ksys3act8InfoData11getIntByKeyERKN2al9ByamlIterEPKcib
0x0000007100d2f0b0,bymlGetString,84,_ZN4ksys3act8InfoData14getStringByKeyERKN2al9ByamlIterEPKcRKN4sead14SafeStringBaseIcEE
0x0000007100d2f0b0,bymlGetString,84,_ZN4ksys3act8InfoData14getStringByKeyERKN2al9ByamlIterEPKcRKN4sead14SafeStringBaseIcEEb
0x0000007100d2f104,sub_7100D2F104,608,_ZNK4ksys3act8InfoData11getLocatorsEPKcRNS1_8LocatorsE
0x0000007100d2f364,sub_7100D2F364,348,_ZNK4ksys3act8InfoData12getHomeAreasEPKcRNS1_9HomeAreasE
0x0000007100d2f4c0,ActorInfoData::x_1,560,_ZNK4ksys3act8InfoData24getInvalidLifeConditionsEPKcRNS1_21InvalidLifeConditionsE

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

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

@ -210,7 +210,7 @@ s32 InfoData::getIntByKey(const al::ByamlIter& iter, const char* key, s32 defaul
}
const char* InfoData::getStringByKey(const al::ByamlIter& iter, const char* key,
const sead::SafeString& default_) {
const sead::SafeString& default_, bool) {
const char* value;
return iter.tryGetStringByKey(&value, key) ? value : default_.cstr();
}

3
src/KingSystem/ActorSystem/actInfoData.h
View File

@ -142,7 +142,8 @@ public:
bool x = true);
static const char*
getStringByKey(const al::ByamlIter& iter, const char* key,
const sead::SafeString& default_ = sead::SafeString::cEmptyString);
const sead::SafeString& default_ = sead::SafeString::cEmptyString,
bool x = true);
private:
struct DebugEntry {