ksys/act/AI: Rename AI handleMessage2_ and fix parameter type

4 files changed, 9 insertions, 10 deletions

diff --git a/src/Game/AI/AI/aiForkAI.cpp b/src/Game/AI/AI/aiForkAI.cpp
index dc738ecb..a83b79cf 100644
--- a/src/Game/AI/AI/aiForkAI.cpp
+++ b/src/Game/AI/AI/aiForkAI.cpp
@@ -115,17 +115,17 @@ bool ForkAI::handleMessage_(ksys::Message* message) {
     return true;
 }
 
-bool ForkAI::handleMessage2_(ksys::Message* message) {
+bool ForkAI::handleAck_(ksys::MessageAck* message) {
     const int num_children = getNumChildren();
 
     bool ok = false;
     for (int i = 0; i < num_children - 1; ++i)
-        ok |= getChild(i)->handleMessage2(message);
+        ok |= getChild(i)->handleAck(message);
 
     if (!ok)
         return false;
 
-    getChild(num_children - 1)->handleMessage2(message);
+    getChild(num_children - 1)->handleAck(message);
     return true;
 }
 
diff --git a/src/Game/AI/AI/aiForkAI.h b/src/Game/AI/AI/aiForkAI.h
index be52feb1..e473145d 100644
--- a/src/Game/AI/AI/aiForkAI.h
+++ b/src/Game/AI/AI/aiForkAI.h
@@ -19,7 +19,7 @@ public:
     bool isFinished() const override;
     bool isFlag4Set() const override;
     bool handleMessage_(ksys::Message* message) override;
-    bool handleMessage2_(ksys::Message* message) override;
+    bool handleAck_(ksys::MessageAck* message) override;
     void getCurrentName(sead::BufferedSafeString* name, ActionBase* last) const override;
     void getNames(sead::BufferedSafeString* out) const override;
 };
diff --git a/src/KingSystem/ActorSystem/actAiActionBase.cpp b/src/KingSystem/ActorSystem/actAiActionBase.cpp
index 458fabfc..5afdedc6 100644
--- a/src/KingSystem/ActorSystem/actAiActionBase.cpp
+++ b/src/KingSystem/ActorSystem/actAiActionBase.cpp
@@ -235,9 +235,9 @@ bool ActionBase::handleMessage(Message* message) {
     return true;
 }
 
-bool ActionBase::handleMessage2(Message* message) {
+bool ActionBase::handleAck(MessageAck* message) {
     auto* action = this;
-    while (!action->handleMessage2_(message)) {
+    while (!action->handleAck_(message)) {
         action = action->getCurrentChild();
         if (!action)
             return false;
diff --git a/src/KingSystem/ActorSystem/actAiActionBase.h b/src/KingSystem/ActorSystem/actAiActionBase.h
index d21ee008..19189e2a 100644
--- a/src/KingSystem/ActorSystem/actAiActionBase.h
+++ b/src/KingSystem/ActorSystem/actAiActionBase.h
@@ -11,6 +11,7 @@
 namespace ksys {
 struct AIDefSet;
 class Message;
+class MessageAck;
 struct MesTransceiverId;
 }  // namespace ksys
 
@@ -70,8 +71,7 @@ public:
 
     Action* getCurrentAction();
     bool handleMessage(Message* message);
-    // TODO: rename
-    bool handleMessage2(Message* message);
+    bool handleAck(MessageAck* message);
 
     Actor* getActor() const { return mActor; }
     s32 getDefinitionIdx() const { return mDefinitionIdx; }
@@ -95,8 +95,7 @@ protected:
     virtual void leave_() {}
     virtual void loadParams_() {}
     virtual bool handleMessage_(Message* message) { return false; }
-    // TODO: rename
-    virtual bool handleMessage2_(Message* message) { return false; }
+    virtual bool handleAck_(MessageAck* message) { return false; }
 
 public:
     virtual bool updateForPreDelete() { return true; }