summaryrefslogtreecommitdiff
path: root/src/KingSystem/ActorSystem
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-10-16 19:48:30 +0200
committerLéo Lam <leo@leolam.fr>2021-10-16 20:20:55 +0200
commit9b4af6eb004bc31196a7e733df35ee7457cf65a0 (patch)
tree0629a4d8ec9e8428619f6bcff574722714e27643 /src/KingSystem/ActorSystem
parent487de7a9a7218f3210c110db315d8486a42caf91 (diff)
ksys/act/AI: Rename AI handleMessage2_ and fix parameter type
Diffstat (limited to 'src/KingSystem/ActorSystem')
-rw-r--r--src/KingSystem/ActorSystem/actAiActionBase.cpp4
-rw-r--r--src/KingSystem/ActorSystem/actAiActionBase.h7
2 files changed, 5 insertions, 6 deletions
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; }