summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-02-07 15:09:13 +0100
committerLéo Lam <leo@leolam.fr>2021-02-07 16:09:02 +0100
commit6699c1fb38549d66fea50ab3af1ca327ff32ca06 (patch)
treeba0697617a3fe9596b40e409ec7ccbd6f8e23406
parent37d4a0695cb941078f00d0fd6958ce6fa1b51616 (diff)
ksys/evt: Fix matching issue in OrderParam::initialize
-rw-r--r--data/uking_functions.csv2
-rw-r--r--src/KingSystem/Event/evtOrderParam.cpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index ac83bfb2..8d94952c 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -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
diff --git a/src/KingSystem/Event/evtOrderParam.cpp b/src/KingSystem/Event/evtOrderParam.cpp
index 5ff22d1d..5d174cb4 100644
--- a/src/KingSystem/Event/evtOrderParam.cpp
+++ b/src/KingSystem/Event/evtOrderParam.cpp
@@ -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;