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

ksys/evt: Fix matching issue in OrderParam::initialize

This commit is contained in:
Léo Lam 2021-02-07 15:09:13 +01:00
parent 37d4a0695c
commit 6699c1fb38
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/uking_functions.csv
View File

@ -75591,7 +75591,7 @@
0x0000007100db4938,ksys::evt::OrderParam::dtorDelete,52,_ZN4ksys3evt10OrderParamD0Ev
0x0000007100db496c,ksys::evt::OrderParam::doAssign,1160,_ZN4ksys3evt10OrderParam8doAssignEPS1_
0x0000007100db4df4,ksys::evt::OrderParam::assign,48,_ZN4ksys3evt10OrderParam6assignEPS1_
0x0000007100db4e24,ksys::evt::OrderParam::initialize,332,_ZN4ksys3evt10OrderParam10initializeEi?
0x0000007100db4e24,ksys::evt::OrderParam::initialize,332,_ZN4ksys3evt10OrderParam10initializeEi
0x0000007100db4f70,ksys::evt::OrderParam::addParamInt,220,_ZN4ksys3evt10OrderParam11addParamIntEiRKN4sead14SafeStringBaseIcEE
0x0000007100db504c,ksys::evt::OrderParam::addParamString,412,_ZN4ksys3evt10OrderParam14addParamStringERKN4sead14SafeStringBaseIcEES6_
0x0000007100db51e8,ksys::evt::OrderParam::tryAlloc_,944,_ZN4ksys3evt10OrderParam8tryAllocENS0_14OrderParamTypeEjRKN4sead14SafeStringBaseIcEE

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

7
src/KingSystem/Event/evtOrderParam.cpp
View File

@ -28,10 +28,9 @@ bool OrderParam::initialize(s32 entry_count) {
if (!mEntries.tryAllocBuffer(entry_count, mHeap))
return false;
for (s32 i = 0; i < entry_count; i++) {
clearEntry(&mEntries[i]); // no matter what I do, the compiler unrolls the first 2
// iterations out of the loop
}
for (u32 i = 0; i < u32(entry_count); i++)
clearEntry(&mEntries[i]);
mEntryCount = 0;
mInitialized = true;
return true;