From ad01b2b1fbd4deb987a43261b1a3160d549a3c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Sun, 8 Nov 2020 12:22:08 +0100
Subject: [PATCH] ksys/act: Fix matching issue in ActorParam

---
 data/uking_functions.csv                      |   2 +-
 ..._ZN4ksys3act10ActorParam10deleteDataEv.bin | Bin 440 -> 0 bytes
 src/KingSystem/ActorSystem/actActorParam.cpp  |  18 ++++++++----------
 src/KingSystem/ActorSystem/actActorParam.h    |   7 +++----
 4 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 expected/_ZN4ksys3act10ActorParam10deleteDataEv.bin

diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index 97e8986e..fefe37e3 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -89049,7 +89049,7 @@
 0x000000710118576c,memsetSomeMemory,36,_ZN4ksys3act10ActorParam19resetDummyResourcesEv
 0x0000007101185790,ActorParam::Event::ctor,244,_ZN4ksys3act10ActorParamC1Ev
 0x0000007101185884,sub_7101185884,60,_ZN4ksys3act10ActorParamD1Ev
-0x00000071011858c0,ActorParam::Data::doUnload,440,_ZN4ksys3act10ActorParam10deleteDataEv?
+0x00000071011858c0,ActorParam::Data::doUnload,440,_ZN4ksys3act10ActorParam10deleteDataEv
 0x0000007101185a78,sub_7101185A78,68,_ZN4ksys3act10ActorParamD0Ev
 0x0000007101185abc,ActorParam::Load::deleteRes2,164,_ZN4ksys3act10ActorParam16deleteResHandlesEv
 0x0000007101185b60,ActorParam::Load::isDummyParamResource,136,_ZNK4ksys3act10ActorParam12isDummyParamENS_3res9ActorLink5Users4UserE
diff --git a/expected/_ZN4ksys3act10ActorParam10deleteDataEv.bin b/expected/_ZN4ksys3act10ActorParam10deleteDataEv.bin
deleted file mode 100644
index 2f45a6e16124271a72a6282a90205ebac85bc5f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 440
zcmewnzh~vQaK@Ei{Fzq%t!7^N_b|i6FU$<9CNr^3e84QcN_6-C=_lD3E_CoY{M6j(
z_>+Ut!O|Rv<r&4Z6}TBfI*J^3%Cj;Qo@QhS`N}N6>KhPu1Uc^PT<7ppi&3;&o>A<z
zLu2QxWl@Y%I*J;1USngJxYdbq;(aEL*Qfve59ug_=$~K2xD&;UB%m4FP|cVMGNTOB
zjA=l-=9e+<{Km+z<tww;sug|lKRAGF4o;44iMKVEPcTVzGdMC{j05VIaAv$X<NyDy
z512()Mf&}pK7Sp<&-p=&JEsBdBBb9BO}{5d|2ClhB*vXnf#Ji!%CLdsA=||LK)*Qv
z!=po~VJ9am!$o;UhQe=$J7<CHe8?=X^$6%jbI<?Nw`ZAIG$=7mWRh$M0*TMBV%#}j
oi^0+WDA&NmKJior(-cq~{H=Bd#*Y&)o*Y;Hh(EGo%dY?806UqvEC2ui

diff --git a/src/KingSystem/ActorSystem/actActorParam.cpp b/src/KingSystem/ActorSystem/actActorParam.cpp
index 26b89dc5..7ce2bc06 100644
--- a/src/KingSystem/ActorSystem/actActorParam.cpp
+++ b/src/KingSystem/ActorSystem/actActorParam.cpp
@@ -11,7 +11,7 @@ void ActorParam::resetDummyResources() {
 
 ActorParam::ActorParam() {
     mRes = {};
-    mNumHandles1 = mNumHandles2 = 0;
+    mNumHandles = {};
     mEvent.resetSignal();
 }
 
@@ -26,13 +26,11 @@ void ActorParam::deleteData() {
     if (mActorName.isEmpty())
         return;
 
-    for (s32 i = 0; i < mNumHandles1; ++i)
-        mHandles1[i].requestUnload();
-    mNumHandles1 = 0;
-
-    for (s32 i = 0; i < mNumHandles2; ++i)
-        mHandles2[i].requestUnload();
-    mNumHandles2 = 0;
+    for (size_t i = 0; i < mNumHandles.size(); ++i) {
+        for (s32 handle_idx = 0; handle_idx < mNumHandles[i]; ++handle_idx)
+            mHandles[i][handle_idx].requestUnload();
+        mNumHandles[i] = 0;
+    }
 
     deleteResHandles();
 
@@ -44,8 +42,8 @@ void ActorParam::deleteData() {
 }
 
 void ActorParam::deleteResHandles() {
-    mHandles1.freeBuffer();
-    mHandles2.freeBuffer();
+    for (auto& handles : mHandles)
+        handles.freeBuffer();
 }
 
 bool ActorParam::isDummyParam(res::ActorLink::Users::User user) const {
diff --git a/src/KingSystem/ActorSystem/actActorParam.h b/src/KingSystem/ActorSystem/actActorParam.h
index 097ee3e9..7bbe536d 100644
--- a/src/KingSystem/ActorSystem/actActorParam.h
+++ b/src/KingSystem/ActorSystem/actActorParam.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <array>
 #include <container/seadBuffer.h>
 #include <heap/seadDisposer.h>
 #include <hostio/seadHostIONode.h>
@@ -112,10 +113,8 @@ public:
     Priority mPriority = Priority::AllAfter;
     u32 _74 = 2;
     Resources mRes;
-    sead::Buffer<res::Handle> mHandles1;
-    sead::Buffer<res::Handle> mHandles2;
-    s32 mNumHandles1;
-    s32 mNumHandles2;
+    std::array<sead::Buffer<res::Handle>, 2> mHandles;
+    std::array<s32, 2> mNumHandles;
     u32 _168{};
 
     static void resetDummyResources();