From fa45c131994048c57aa21c65bfa6beea8bc51dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 11:47:11 +0200 Subject: [PATCH] ksys/res: Implement GParamList BindActor --- CMakeLists.txt | 1 + data/uking_functions.csv | 2 +- .../resGParamListObjectBindActor.h | 25 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 04c475a7..025c8790 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index a73dfaeb..4b3354fb 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89190,7 +89190,7 @@ 0x00000071011a7d94,sub_71011A7D94,12,_ZNK4ksys3res20GParamListObjectPrey7getNameEv 0x00000071011a7da0,sub_71011A7DA0,12,_ZNK4ksys3res34GParamListObjectAnimalFollowOffset7getNameEv 0x00000071011a7dac,sub_71011A7DAC,12,_ZNK4ksys3res30GParamListObjectExtendedEntity7getNameEv -0x00000071011a7db8,sub_71011A7DB8,12, +0x00000071011a7db8,sub_71011A7DB8,12,_ZNK4ksys3res25GParamListObjectBindActor7getNameEv 0x00000071011a7dc4,sub_71011A7DC4,12, 0x00000071011a7dd0,sub_71011A7DD0,12, 0x00000071011a7ddc,sub_71011A7DDC,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h new file mode 100644 index 00000000..f8354254 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h @@ -0,0 +1,25 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectBindActor : public GParamListObject { +public: + GParamListObjectBindActor(); + const char* getName() const override { return "BindActor"; } + + agl::utl::Parameter mBindActorName; + agl::utl::Parameter mIsKeepSleep; +}; + +inline GParamListObjectBindActor::GParamListObjectBindActor() { + auto* const obj = &mObj; + + mBindActorName.init("", "BindActorName", "", obj); + mIsKeepSleep.init(false, "IsKeepSleep", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index d3d7ad4f..a252c628 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -11,6 +11,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h" @@ -132,6 +133,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { dummy_list); add(archive.getRootList(), "ExtendedEntity", heap, dummy_list); + add(archive.getRootList(), "BindActor", heap, dummy_list); // TODO: the rest