falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Léo Lam 2021-10-16 19:48:30 +02:00
parent 487de7a9a7
commit 9b4af6eb00
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
7 changed files with 255 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

484
data/uking_functions.csv
View File

File diff suppressed because it is too large Load Diff

6
src/Game/AI/AI/aiForkAI.cpp
View File

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

2
src/Game/AI/AI/aiForkAI.h
View File

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

4
src/KingSystem/ActorSystem/actAiActionBase.cpp
View File

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

7
src/KingSystem/ActorSystem/actAiActionBase.h
View File

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

4
tools/ida_ai_rename_action_vfns.py
View File

@ -24,8 +24,8 @@ _vtable_fn_names = [
"_ZN5uking6action{}8reenter_EPS2_b",
"_ZN5uking6action{}6leave_Ev",
"_ZN5uking6action{}11loadParams_Ev",
"_ZN5uking6action{}14handleMessage_EPN4ksys3mes7MessageE",
"_ZN5uking6action{}15handleMessage2_EPN4ksys3mes7MessageE",
"_ZN5uking6action{}14handleMessage_EPN4ksys7MessageE",
"_ZN5uking6action{}10handleAck_EPN4ksys10MessageAckE",
"_ZN5uking6action{}18updateForPreDeleteEv",
"_ZN5uking6action{}11onPreDeleteEv",
"_ZN5uking6action{}4calcEv",

4
tools/ida_ai_rename_ai_vfns.py
View File

@ -24,8 +24,8 @@ _vtable_fn_names = [
"_ZN5uking2ai{}8reenter_EPS2_b",
"_ZN5uking2ai{}6leave_Ev",
"_ZN5uking2ai{}11loadParams_Ev",
"_ZN5uking2ai{}14handleMessage_EPN4ksys3mes7MessageE",
"_ZN5uking2ai{}15handleMessage2_EPN4ksys3mes7MessageE",
"_ZN5uking2ai{}14handleMessage_EPN4ksys7MessageE",
"_ZN5uking2ai{}10handleAck_EPN4ksys10MessageAckE",
"_ZN5uking2ai{}18updateForPreDeleteEv",
"_ZN5uking2ai{}11onPreDeleteEv",
"_ZN5uking2ai{}4calcEv",