mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-06-25 01:12:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

ksys/evt: Match OrderParam "get T by name" getters

Browse Source
This commit is contained in:
Léo Lam
2021-02-04 18:56:20 +01:00
parent 85430d3232
commit 9c6bec732f
3 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/Event/evtOrderParam.cpp
+17 -5
View File
@@ -91,18 +91,17 @@ void OrderParam::addParamActor(ksys::act::BaseProc& actor, sead::SafeString& nam
}
}
}
// The three below have 1 pair of instructions swapped
bool OrderParam::getIntByName(const sead::SafeString& name, u32** out_ptr) {
return tryGetPointerByName(name, (void**)out_ptr, nullptr, OrderParamType::INT);
return getPointerByName(name, out_ptr, nullptr, OrderParamType::INT);
}
bool OrderParam::getStringByName(const sead::SafeString& name, sead::SafeString** out_ptr) {
return tryGetPointerByName(name, (void**)out_ptr, nullptr, OrderParamType::STRING);
return getPointerByName(name, out_ptr, nullptr, OrderParamType::STRING);
}
bool OrderParam::getArrayByName(const sead::SafeString& name, void** out_ptr, u32* out_size) {
return tryGetPointerByName(name, out_ptr, out_size, OrderParamType::ARRAY);
return getPointerByName(name, out_ptr, out_size, OrderParamType::ARRAY);
}
// This one also does not match
@@ -170,4 +169,17 @@ OrderParamEntry* OrderParam::tryAlloc(OrderParamType type, u32 size, sead::SafeS
return nullptr;
}
} // namespace ksys::evt
void* OrderParam::getPointerByName(const sead::SafeString& name, u32* out_size,
OrderParamType type) const {
const u32 hash = sead::HashCRC32::calcStringHash(name);
for (s32 i = 0; i < mEntries.size(); i++) {
if (mEntries[i].mHash == hash && mEntries[i].mType == type) {
if (out_size)
*out_size = mEntries[i].mSize;
return mEntries[i].mPointer;
}
}
return nullptr;
}
} // namespace ksys::evt