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

ksys/act/AI: Take const ref for messages

This commit is contained in:
Léo Lam 2021-10-16 20:15:44 +02:00
parent 9b4af6eb00
commit 28515aceb5
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
8 changed files with 260 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

490
data/uking_functions.csv
View File

File diff suppressed because it is too large Load Diff

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

@ -101,7 +101,7 @@ bool ForkAI::isFlag4Set() const {
return true; return true;
} }
bool ForkAI::handleMessage_(ksys::Message* message) { bool ForkAI::handleMessage_(const ksys::Message& message) {
const int num_children = getNumChildren(); const int num_children = getNumChildren();
bool ok = false; bool ok = false;
@ -115,7 +115,7 @@ bool ForkAI::handleMessage_(ksys::Message* message) {
return true; return true;
} }
bool ForkAI::handleAck_(ksys::MessageAck* message) { bool ForkAI::handleAck_(const ksys::MessageAck& message) {
const int num_children = getNumChildren(); const int num_children = getNumChildren();
bool ok = false; bool ok = false;

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

@ -18,8 +18,8 @@ public:
bool isFailed() const override; bool isFailed() const override;
bool isFinished() const override; bool isFinished() const override;
bool isFlag4Set() const override; bool isFlag4Set() const override;
bool handleMessage_(ksys::Message* message) override; bool handleMessage_(const ksys::Message& message) override;
bool handleAck_(ksys::MessageAck* message) override; bool handleAck_(const ksys::MessageAck& message) override;
void getCurrentName(sead::BufferedSafeString* name, ActionBase* last) const override; void getCurrentName(sead::BufferedSafeString* name, ActionBase* last) const override;
void getNames(sead::BufferedSafeString* out) const override; void getNames(sead::BufferedSafeString* out) const override;
}; };

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

@ -225,7 +225,7 @@ Action* ActionBase::getCurrentAction() {
} }
} }
bool ActionBase::handleMessage(Message* message) { bool ActionBase::handleMessage(const Message& message) {
auto* action = this; auto* action = this;
while (!action->handleMessage_(message)) { while (!action->handleMessage_(message)) {
action = action->getCurrentChild(); action = action->getCurrentChild();
@ -235,7 +235,7 @@ bool ActionBase::handleMessage(Message* message) {
return true; return true;
} }
bool ActionBase::handleAck(MessageAck* message) { bool ActionBase::handleAck(const MessageAck& message) {
auto* action = this; auto* action = this;
while (!action->handleAck_(message)) { while (!action->handleAck_(message)) {
action = action->getCurrentChild(); action = action->getCurrentChild();

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

@ -70,8 +70,8 @@ public:
bool oneShot(InlineParamPack* params); bool oneShot(InlineParamPack* params);
Action* getCurrentAction(); Action* getCurrentAction();
bool handleMessage(Message* message); bool handleMessage(const Message& message);
bool handleAck(MessageAck* message); bool handleAck(const MessageAck& message);
Actor* getActor() const { return mActor; } Actor* getActor() const { return mActor; }
s32 getDefinitionIdx() const { return mDefinitionIdx; } s32 getDefinitionIdx() const { return mDefinitionIdx; }
@ -94,8 +94,8 @@ protected:
virtual bool reenter_(ActionBase* other, bool x); virtual bool reenter_(ActionBase* other, bool x);
virtual void leave_() {} virtual void leave_() {}
virtual void loadParams_() {} virtual void loadParams_() {}
virtual bool handleMessage_(Message* message) { return false; } virtual bool handleMessage_(const Message& message) { return false; }
virtual bool handleAck_(MessageAck* message) { return false; } virtual bool handleAck_(const MessageAck& message) { return false; }
public: public:
virtual bool updateForPreDelete() { return true; } virtual bool updateForPreDelete() { return true; }

2
src/KingSystem/ActorSystem/actAiRoot.h
View File

@ -34,7 +34,7 @@ public:
bool init_(sead::Heap* heap) override; bool init_(sead::Heap* heap) override;
void enter_(InlineParamPack* params) override; void enter_(InlineParamPack* params) override;
void leave_() override; void leave_() override;
bool handleMessage_(Message* message) override; bool handleMessage_(const Message& message) override;
void calc() override; void calc() override;
const ParamPack& getMapUnitParams() const { return mMapUnitParams; } const ParamPack& getMapUnitParams() const { return mMapUnitParams; }

4
tools/ida_ai_rename_action_vfns.py
View File

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

4
tools/ida_ai_rename_ai_vfns.py
View File

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