From 17c7e12a0b9ed453ddcf62a3169bd3f26ef2fb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Mon, 28 Dec 2020 17:46:58 +0100
Subject: [PATCH] uking: Fix matching issues in actions

---
 src/Game/AI/Action/actionAnmTimingBackWalk.cpp              | 2 +-
 src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp      | 2 +-
 src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp     | 2 +-
 src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp | 4 ++--
 src/Game/AI/Action/actionForkNoSlowTimer.cpp                | 4 ++--
 src/Game/AI/Action/actionForkTimerForceResetCondition.cpp   | 4 ++--
 src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp  | 6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Game/AI/Action/actionAnmTimingBackWalk.cpp b/src/Game/AI/Action/actionAnmTimingBackWalk.cpp
index 3430c85b..4ab560a7 100644
--- a/src/Game/AI/Action/actionAnmTimingBackWalk.cpp
+++ b/src/Game/AI/Action/actionAnmTimingBackWalk.cpp
@@ -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_() {
diff --git a/src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp b/src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp
index 6eac4db9..07d63c41 100644
--- a/src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp
+++ b/src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp
@@ -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) {
diff --git a/src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp b/src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp
index 42770daf..ee6c0900 100644
--- a/src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp
+++ b/src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp
@@ -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) {
diff --git a/src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp b/src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp
index a6809605..06a7fcf7 100644
--- a/src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp
+++ b/src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp
@@ -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_() {
diff --git a/src/Game/AI/Action/actionForkNoSlowTimer.cpp b/src/Game/AI/Action/actionForkNoSlowTimer.cpp
index 0d8c50e2..49aac0b9 100644
--- a/src/Game/AI/Action/actionForkNoSlowTimer.cpp
+++ b/src/Game/AI/Action/actionForkNoSlowTimer.cpp
@@ -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_() {
diff --git a/src/Game/AI/Action/actionForkTimerForceResetCondition.cpp b/src/Game/AI/Action/actionForkTimerForceResetCondition.cpp
index e08656f0..e370d177 100644
--- a/src/Game/AI/Action/actionForkTimerForceResetCondition.cpp
+++ b/src/Game/AI/Action/actionForkTimerForceResetCondition.cpp
@@ -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_() {
diff --git a/src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp b/src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp
index aeda9e9b..0de2fc15 100644
--- a/src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp
+++ b/src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp
@@ -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_() {