ksys/act: Rename ai::ClassArg for consistency with Query::InitArg

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,

src/Game/AI/Action/actionSetInstEventFlag.cpp

@@ -3,8 +3,7 @@
 
 namespace uking::action {
 
-SetInstEventFlagAction::SetInstEventFlagAction(const ksys::act::ai::ClassArg& arg)
+SetInstEventFlagAction::SetInstEventFlagAction(const InitArg& arg) : ksys::act::ai::Action(arg) {}
-    : ksys::act::ai::Action(arg) {}
 
 SetInstEventFlagAction::~SetInstEventFlagAction() = default;
 

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
+}  // namespace uking::action

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;

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;

src/KingSystem/ActorSystem/CMakeLists.txt

@@ -23,8 +23,8 @@ target_sources(uking PRIVATE
   actActorUtil.h
   actAiAction.cpp
   actAiAction.h
-  actAiClass.cpp
+  actAiActionBase.cpp
-  actAiClass.h
+  actAiActionBase.h
   actAiClassDef.cpp
   actAiClassDef.h
   actAiParam.cpp

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;

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() {}

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)
+ActionBase::ActionBase(const InitArg& arg)
-    : mActor{arg.actor}, mDefinitionIdx{u16(arg.definitionIdx)}, mRootIdx{u8(arg.rootIdx)} {}
+    : mActor{arg.actor}, mDefinitionIdx{u16(arg.def_idx)}, mRootIdx{u8(arg.root_idx)} {}
 
 bool ActionBase::isFinished() {
     return mStatus.isOn(Status::Finished);

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();

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

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;
 };