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

uking: Fix matching issues in actions

This commit is contained in:
Léo Lam 2020-12-28 17:46:58 +01:00
parent 1b89dc7024
commit 17c7e12a0b
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Game/AI/Action/actionAnmTimingBackWalk.cpp
View File

@ -15,7 +15,7 @@ void AnmTimingBackWalk::enter_(ksys::act::ai::InlineParamPack* params) {
}
void AnmTimingBackWalk::leave_() {
BackWalkWithAS::leave_();
BackWalkEx::leave_(); // NOLINT(bugprone-parent-virtual-call)
}
void AnmTimingBackWalk::loadParams_() {

2
src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp
View File

@ -7,7 +7,7 @@ EnemyFortressSimpleAction::EnemyFortressSimpleAction(const InitArg& arg) : ForkT
EnemyFortressSimpleAction::~EnemyFortressSimpleAction() = default;
bool EnemyFortressSimpleAction::init_(sead::Heap* heap) {
return ForkTimer::init_(heap);
return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call)
}
void EnemyFortressSimpleAction::enter_(ksys::act::ai::InlineParamPack* params) {

2
src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp
View File

@ -8,7 +8,7 @@ ForceGetUpWaterFloatFreeze::ForceGetUpWaterFloatFreeze(const InitArg& arg)
ForceGetUpWaterFloatFreeze::~ForceGetUpWaterFloatFreeze() = default;
bool ForceGetUpWaterFloatFreeze::init_(sead::Heap* heap) {
return WaterFloatFreeze::init_(heap);
return WaterFloatImmobile::init_(heap); // NOLINT(bugprone-parent-virtual-call)
}
void ForceGetUpWaterFloatFreeze::enter_(ksys::act::ai::InlineParamPack* params) {

4
src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp
View File

@ -8,7 +8,7 @@ ForkNoCountActionReservedTimer::ForkNoCountActionReservedTimer(const InitArg& ar
ForkNoCountActionReservedTimer::~ForkNoCountActionReservedTimer() = default;
bool ForkNoCountActionReservedTimer::init_(sead::Heap* heap) {
return ForkTimer::init_(heap);
return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call)
}
void ForkNoCountActionReservedTimer::enter_(ksys::act::ai::InlineParamPack* params) {
@ -16,7 +16,7 @@ void ForkNoCountActionReservedTimer::enter_(ksys::act::ai::InlineParamPack* para
}
void ForkNoCountActionReservedTimer::leave_() {
ForkTimer::leave_();
ForkTimerBase::leave_(); // NOLINT(bugprone-parent-virtual-call)
}
void ForkNoCountActionReservedTimer::loadParams_() {

4
src/Game/AI/Action/actionForkNoSlowTimer.cpp
View File

@ -7,7 +7,7 @@ ForkNoSlowTimer::ForkNoSlowTimer(const InitArg& arg) : ForkTimer(arg) {}
ForkNoSlowTimer::~ForkNoSlowTimer() = default;
bool ForkNoSlowTimer::init_(sead::Heap* heap) {
return ForkTimer::init_(heap);
return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call)
}
void ForkNoSlowTimer::enter_(ksys::act::ai::InlineParamPack* params) {
@ -15,7 +15,7 @@ void ForkNoSlowTimer::enter_(ksys::act::ai::InlineParamPack* params) {
}
void ForkNoSlowTimer::leave_() {
ForkTimer::leave_();
ForkTimerBase::leave_(); // NOLINT(bugprone-parent-virtual-call)
}
void ForkNoSlowTimer::loadParams_() {

4
src/Game/AI/Action/actionForkTimerForceResetCondition.cpp
View File

@ -7,7 +7,7 @@ ForkTimerForceResetCondition::ForkTimerForceResetCondition(const InitArg& arg) :
ForkTimerForceResetCondition::~ForkTimerForceResetCondition() = default;
bool ForkTimerForceResetCondition::init_(sead::Heap* heap) {
return ForkTimer::init_(heap);
return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call)
}
void ForkTimerForceResetCondition::enter_(ksys::act::ai::InlineParamPack* params) {
@ -15,7 +15,7 @@ void ForkTimerForceResetCondition::enter_(ksys::act::ai::InlineParamPack* params
}
void ForkTimerForceResetCondition::leave_() {
ForkTimer::leave_();
ForkTimerBase::leave_(); // NOLINT(bugprone-parent-virtual-call)
}
void ForkTimerForceResetCondition::loadParams_() {

6
src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp
View File

@ -8,7 +8,7 @@ PlayerForkDropWeaponWithSpeed::PlayerForkDropWeaponWithSpeed(const InitArg& arg)
PlayerForkDropWeaponWithSpeed::~PlayerForkDropWeaponWithSpeed() = default;
bool PlayerForkDropWeaponWithSpeed::init_(sead::Heap* heap) {
return ForkDropWeaponWithSpeed::init_(heap);
return ForkDropWeapon::init_(heap); // NOLINT(bugprone-parent-virtual-call)
}
void PlayerForkDropWeaponWithSpeed::enter_(ksys::act::ai::InlineParamPack* params) {
@ -16,11 +16,11 @@ void PlayerForkDropWeaponWithSpeed::enter_(ksys::act::ai::InlineParamPack* param
}
void PlayerForkDropWeaponWithSpeed::leave_() {
ForkDropWeaponWithSpeed::leave_();
ForkDropWeapon::leave_(); // NOLINT(bugprone-parent-virtual-call)
}
void PlayerForkDropWeaponWithSpeed::loadParams_() {
ForkDropWeapon::loadParams_();
ForkDropWeapon::loadParams_(); // NOLINT(bugprone-parent-virtual-call)
}
void PlayerForkDropWeaponWithSpeed::calc_() {