From 5a1a488ed33f35752749175eb12de4590d7629b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 6 Dec 2020 16:01:32 +0100 Subject: [PATCH] ksys/act: Rename ai::ClassArg for consistency with Query::InitArg --- data/uking_functions.csv | 8 ++++---- src/Game/AI/Action/actionSetInstEventFlag.cpp | 3 +-- src/Game/AI/Action/actionSetInstEventFlag.h | 4 ++-- src/Game/AI/Action/actionSetLinkTagBasic.cpp | 2 +- src/Game/AI/Action/actionSetLinkTagBasic.h | 2 +- src/KingSystem/ActorSystem/CMakeLists.txt | 4 ++-- src/KingSystem/ActorSystem/actAiAction.cpp | 2 +- src/KingSystem/ActorSystem/actAiAction.h | 4 ++-- .../{actAiClass.cpp => actAiActionBase.cpp} | 6 +++--- .../{actAiClass.h => actAiActionBase.h} | 17 +++++++++-------- src/KingSystem/ActorSystem/actAiQuery.cpp | 2 +- src/KingSystem/ActorSystem/actAiQuery.h | 6 +++--- 12 files changed, 30 insertions(+), 30 deletions(-) rename src/KingSystem/ActorSystem/{actAiClass.cpp => actAiActionBase.cpp} (69%) rename src/KingSystem/ActorSystem/{actAiClass.h => actAiActionBase.h} (80%) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 7a15f081..bd60c994 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -15793,7 +15793,7 @@ 0x0000007100249614,AI_Action_SetInstantTemperture::loadParams,4, 0x0000007100249618,AI_Action_SetInstantTemperture::rtti1,288, 0x0000007100249738,AI_Action_SetInstantTemperture::rtti2,92, -0x0000007100249794,AI_Action_SetInstEventFlag::ctor,48,_ZN5uking6action22SetInstEventFlagActionC1ERKN4ksys3act2ai8ClassArgE +0x0000007100249794,AI_Action_SetInstEventFlag::ctor,48,_ZN5uking6action22SetInstEventFlagActionC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071002497c4,AI_Action_SetInstEventFlag::dtor,20,_ZN5uking6action22SetInstEventFlagActionD1Ev 0x00000071002497d8,AI_Action_SetInstEventFlag::dtorDelete,52,_ZN5uking6action22SetInstEventFlagActionD0Ev 0x000000710024980c,AI_Action_SetInstEventFlag::init,8, @@ -15801,7 +15801,7 @@ 0x0000007100249830,AI_Action_SetInstEventFlag::loadParams,4, 0x0000007100249834,AI_Action_SetInstEventFlag::rtti1,288, 0x0000007100249954,AI_Action_SetInstEventFlag::rtti2,92, -0x00000071002499b0,AI_Action_SetLinkTagBasic::ctor,52,_ZN5uking6action21SetLinkTagBasicActionC1ERKN4ksys3act2ai8ClassArgE +0x00000071002499b0,AI_Action_SetLinkTagBasic::ctor,52,_ZN5uking6action21SetLinkTagBasicActionC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071002499e4,AI_Action_SetLinkTagBasic::dtor,20,_ZN5uking6action21SetLinkTagBasicActionD1Ev 0x00000071002499f8,AI_Action_SetLinkTagBasic::dtorDelete,52,_ZN5uking6action21SetLinkTagBasicActionD0Ev 0x0000007100249a2c,AI_Action_SetLinkTagBasic::init,8, @@ -72993,7 +72993,7 @@ 0x0000007100d15fc0,sub_7100D15FC0,108, 0x0000007100d1602c,j_BaseProcLink::cleanUp,4, 0x0000007100d16030,sub_7100D16030,8, -0x0000007100d16038,AI_AIOrActionBase::ctor,84,_ZN4ksys3act2ai10ActionBaseC1ERKNS1_8ClassArgE +0x0000007100d16038,AI_AIOrActionBase::ctor,84,_ZN4ksys3act2ai10ActionBaseC1ERKNS2_7InitArgE 0x0000007100d1608c,AI_AIOrActionBase::preInit,808, 0x0000007100d163b4,AI_AIOrActionBase::getClassName,176, 0x0000007100d16464,AI_AIOrActionBase::x_0,24, @@ -91911,7 +91911,7 @@ 0x00000071011c226c,sub_71011C226C,24, 0x00000071011c2284,sub_71011C2284,44, 0x00000071011c22b0,sub_71011C22B0,184, -0x00000071011c2368,AI_ActionBase::ctor,48,_ZN4ksys3act2ai6ActionC1ERKNS1_8ClassArgE +0x00000071011c2368,AI_ActionBase::ctor,48,_ZN4ksys3act2ai6ActionC1ERKNS1_10ActionBase7InitArgE 0x00000071011c2398,AI_ActionBase::calcRecursively,12, 0x00000071011c23a4,AI_ActionBase::playAS,288, 0x00000071011c24c4,AI_ActionBase::asListStuff,24, diff --git a/src/Game/AI/Action/actionSetInstEventFlag.cpp b/src/Game/AI/Action/actionSetInstEventFlag.cpp index f4476748..f2cca910 100644 --- a/src/Game/AI/Action/actionSetInstEventFlag.cpp +++ b/src/Game/AI/Action/actionSetInstEventFlag.cpp @@ -3,8 +3,7 @@ namespace uking::action { -SetInstEventFlagAction::SetInstEventFlagAction(const ksys::act::ai::ClassArg& arg) - : ksys::act::ai::Action(arg) {} +SetInstEventFlagAction::SetInstEventFlagAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} SetInstEventFlagAction::~SetInstEventFlagAction() = default; diff --git a/src/Game/AI/Action/actionSetInstEventFlag.h b/src/Game/AI/Action/actionSetInstEventFlag.h index 7dac0a32..1f175eda 100644 --- a/src/Game/AI/Action/actionSetInstEventFlag.h +++ b/src/Game/AI/Action/actionSetInstEventFlag.h @@ -8,11 +8,11 @@ namespace uking::action { class SetInstEventFlagAction : public ksys::act::ai::Action { public: - SetInstEventFlagAction(const ksys::act::ai::ClassArg& arg); + explicit SetInstEventFlagAction(const InitArg& arg); ~SetInstEventFlagAction() override; void oneShot() override; }; KSYS_CHECK_SIZE_NX150(SetInstEventFlagAction, 0x20); -} // namespace uking::action \ No newline at end of file +} // namespace uking::action diff --git a/src/Game/AI/Action/actionSetLinkTagBasic.cpp b/src/Game/AI/Action/actionSetLinkTagBasic.cpp index 775712ad..57003d74 100644 --- a/src/Game/AI/Action/actionSetLinkTagBasic.cpp +++ b/src/Game/AI/Action/actionSetLinkTagBasic.cpp @@ -3,7 +3,7 @@ namespace uking::action { -SetLinkTagBasicAction::SetLinkTagBasicAction(const ksys::act::ai::ClassArg& arg) +SetLinkTagBasicAction::SetLinkTagBasicAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} SetLinkTagBasicAction::~SetLinkTagBasicAction() = default; diff --git a/src/Game/AI/Action/actionSetLinkTagBasic.h b/src/Game/AI/Action/actionSetLinkTagBasic.h index c685bc15..0c13e487 100644 --- a/src/Game/AI/Action/actionSetLinkTagBasic.h +++ b/src/Game/AI/Action/actionSetLinkTagBasic.h @@ -8,7 +8,7 @@ namespace uking::action { class SetLinkTagBasicAction : public ksys::act::ai::Action { public: - SetLinkTagBasicAction(const ksys::act::ai::ClassArg& arg); + explicit SetLinkTagBasicAction(const InitArg& arg); ~SetLinkTagBasicAction() override; void enter() override; diff --git a/src/KingSystem/ActorSystem/CMakeLists.txt b/src/KingSystem/ActorSystem/CMakeLists.txt index 281f81e4..509dbb77 100644 --- a/src/KingSystem/ActorSystem/CMakeLists.txt +++ b/src/KingSystem/ActorSystem/CMakeLists.txt @@ -23,8 +23,8 @@ target_sources(uking PRIVATE actActorUtil.h actAiAction.cpp actAiAction.h - actAiClass.cpp - actAiClass.h + actAiActionBase.cpp + actAiActionBase.h actAiClassDef.cpp actAiClassDef.h actAiParam.cpp diff --git a/src/KingSystem/ActorSystem/actAiAction.cpp b/src/KingSystem/ActorSystem/actAiAction.cpp index 24355040..32766b37 100644 --- a/src/KingSystem/ActorSystem/actAiAction.cpp +++ b/src/KingSystem/ActorSystem/actAiAction.cpp @@ -2,7 +2,7 @@ namespace ksys::act::ai { -Action::Action(const ClassArg& arg) : ActionBase(arg) {} +Action::Action(const InitArg& arg) : ActionBase(arg) {} bool Action::isAction() { return true; diff --git a/src/KingSystem/ActorSystem/actAiAction.h b/src/KingSystem/ActorSystem/actAiAction.h index 2b7b2a3f..2f21b6ba 100644 --- a/src/KingSystem/ActorSystem/actAiAction.h +++ b/src/KingSystem/ActorSystem/actAiAction.h @@ -1,13 +1,13 @@ #pragma once -#include "KingSystem/ActorSystem/actAiClass.h" +#include "KingSystem/ActorSystem/actAiActionBase.h" #include "KingSystem/Utils/Types.h" namespace ksys::act::ai { class Action : public ActionBase { public: - Action(const ClassArg& arg); + explicit Action(const InitArg& arg); virtual void enter() {} virtual void loadParams() {} diff --git a/src/KingSystem/ActorSystem/actAiClass.cpp b/src/KingSystem/ActorSystem/actAiActionBase.cpp similarity index 69% rename from src/KingSystem/ActorSystem/actAiClass.cpp rename to src/KingSystem/ActorSystem/actAiActionBase.cpp index 0fad8b58..9c5fafac 100644 --- a/src/KingSystem/ActorSystem/actAiClass.cpp +++ b/src/KingSystem/ActorSystem/actAiActionBase.cpp @@ -1,9 +1,9 @@ -#include "KingSystem/ActorSystem/actAiClass.h" +#include "KingSystem/ActorSystem/actAiActionBase.h" namespace ksys::act::ai { -ActionBase::ActionBase(const ClassArg& arg) - : mActor{arg.actor}, mDefinitionIdx{u16(arg.definitionIdx)}, mRootIdx{u8(arg.rootIdx)} {} +ActionBase::ActionBase(const InitArg& arg) + : mActor{arg.actor}, mDefinitionIdx{u16(arg.def_idx)}, mRootIdx{u8(arg.root_idx)} {} bool ActionBase::isFinished() { return mStatus.isOn(Status::Finished); diff --git a/src/KingSystem/ActorSystem/actAiClass.h b/src/KingSystem/ActorSystem/actAiActionBase.h similarity index 80% rename from src/KingSystem/ActorSystem/actAiClass.h rename to src/KingSystem/ActorSystem/actAiActionBase.h index 69ac65f1..419c6b08 100644 --- a/src/KingSystem/ActorSystem/actAiClass.h +++ b/src/KingSystem/ActorSystem/actAiActionBase.h @@ -12,16 +12,17 @@ class Actor; namespace ai { -struct ClassArg { - Actor* actor; - u32 definitionIdx; - u32 rootIdx; -}; -KSYS_CHECK_SIZE_NX150(ClassArg, 0x10); - class ActionBase { public: - ActionBase(const ClassArg& arg); + struct InitArg { + Actor* actor; + /// The index of the query definition in the actor's AI program. + s32 def_idx; + s32 root_idx; + }; + KSYS_CHECK_SIZE_NX150(InitArg, 0x10); + + explicit ActionBase(const InitArg& arg); virtual ~ActionBase() = default; virtual bool isAction(); diff --git a/src/KingSystem/ActorSystem/actAiQuery.cpp b/src/KingSystem/ActorSystem/actAiQuery.cpp index 3c997249..f38ab676 100644 --- a/src/KingSystem/ActorSystem/actAiQuery.cpp +++ b/src/KingSystem/ActorSystem/actAiQuery.cpp @@ -2,6 +2,6 @@ namespace ksys::act::ai { -Query::Query(const InitArg& arg) : mProc(arg.proc), mDefIdx(arg.def_idx) {} +Query::Query(const InitArg& arg) : mActor(arg.actor), mDefIdx(arg.def_idx) {} } // namespace ksys::act::ai diff --git a/src/KingSystem/ActorSystem/actAiQuery.h b/src/KingSystem/ActorSystem/actAiQuery.h index 66c2cc0b..18304968 100644 --- a/src/KingSystem/ActorSystem/actAiQuery.h +++ b/src/KingSystem/ActorSystem/actAiQuery.h @@ -6,7 +6,7 @@ #include "KingSystem/Utils/Types.h" namespace ksys::act { -class BaseProc; +class Actor; } namespace ksys::act::ai { @@ -15,7 +15,7 @@ class Query { SEAD_RTTI_BASE(Query) public: struct InitArg { - BaseProc* proc; + Actor* actor; /// The index of the query definition in the actor's AI program. s32 def_idx; }; @@ -35,7 +35,7 @@ public: virtual void m12() {} protected: - BaseProc* mProc; + Actor* mActor; ParamPack mParamPack; s32 mDefIdx; };