From a16f01aed7b6b40b1e48f0e33ab9d10319a26965 Mon Sep 17 00:00:00 2001 From: iTNTPiston Date: Sat, 6 Feb 2021 19:25:25 -0500 Subject: [PATCH] ksys/evt: Add OrderParam ctor and dtor --- data/uking_functions.csv | 6 +++--- src/KingSystem/Event/evtOrderParam.cpp | 4 ++++ workflow.sh | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 31dfc19f..cfbafd0f 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -75585,10 +75585,10 @@ 0x0000007100db3ffc,evt::Event::doAssign,296, 0x0000007100db4124,evt::Event::assign,48, 0x0000007100db4154,sub_7100DB4154,1680, -0x0000007100db47e4,ksys::evt::OrderParam::ctor,36, -0x0000007100db4808,ksys::evt::OrderParam::dtor,20, +0x0000007100db47e4,ksys::evt::OrderParam::ctor,36,_ZN4ksys3evt10OrderParamC1EPN4sead7ExpHeapE +0x0000007100db4808,ksys::evt::OrderParam::dtor,20,_ZN4ksys3evt10OrderParamD1Ev 0x0000007100db481c,ksys::evt::OrderParam::uninitialize,284,_ZN4ksys3evt10OrderParam12uninitializeEv -0x0000007100db4938,ksys::evt::OrderParam::dtorDelete,52, +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? diff --git a/src/KingSystem/Event/evtOrderParam.cpp b/src/KingSystem/Event/evtOrderParam.cpp index 0d4d0b64..46d4f6a1 100644 --- a/src/KingSystem/Event/evtOrderParam.cpp +++ b/src/KingSystem/Event/evtOrderParam.cpp @@ -12,6 +12,10 @@ OrderParam::OrderParam(sead::ExpHeap* heap) { mHeap = heap; } +OrderParam::~OrderParam() { + uninitialize(); +} + bool OrderParam::initialize(s32 entry_count) { sead::FixedSafeString<0x100> error_message; diff --git a/workflow.sh b/workflow.sh index 4f89dae9..8e0cee7b 100755 --- a/workflow.sh +++ b/workflow.sh @@ -6,7 +6,7 @@ # Diff a function (in this example, OrderParam::doAssign, -v is equivalent to --source in diff.py) # ./workflow.sh diff -v _ZN4ksys3evt10OrderParam13addParamActorEPNS_3act8BaseProcERN4sead14SafeStringBaseIcEE # Search for mangle name and diff (-f turns off interaction) -# ./workflow.sh mad -v -f _ZN4ksys3evt10OrderParam13addParamActorEPNS_3act8BaseProcERN4sead14SafeStringBaseIcEE +# ./workflow.sh mad -v -f orderparam::doassign # Get ready to pr # ./workflow.sh check