From 09f917a9aa993fcb11db17783830dbe1cd43f54a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 14 Aug 2019 01:57:13 -0400 Subject: [PATCH] Runtime/Weapon/CGameProjectile: Fix misnamed virtual function This has a vaguely equivalent name to FluidFXThink (which has an uppercase X). Given this function isn't explicitly called anywhere directly, this is assumed to be a typo. --- Runtime/Weapon/CGameProjectile.cpp | 2 +- Runtime/Weapon/CGameProjectile.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Runtime/Weapon/CGameProjectile.cpp b/Runtime/Weapon/CGameProjectile.cpp index 9e545cc17..8e34e6d0f 100644 --- a/Runtime/Weapon/CGameProjectile.cpp +++ b/Runtime/Weapon/CGameProjectile.cpp @@ -229,7 +229,7 @@ void CGameProjectile::ApplyDamageToActors(CStateManager& mgr, const CDamageInfo& x2d0_touchResults.clear(); } -void CGameProjectile::FluidFxThink(EFluidState state, CScriptWater& water, CStateManager& mgr) { +void CGameProjectile::FluidFXThink(EFluidState state, CScriptWater& water, CStateManager& mgr) { if (x170_projectile.GetWeaponDescription()->xa6_SWTR) CWeapon::FluidFXThink(state, water, mgr); } diff --git a/Runtime/Weapon/CGameProjectile.hpp b/Runtime/Weapon/CGameProjectile.hpp index 1699b51bd..c62d2b3df 100644 --- a/Runtime/Weapon/CGameProjectile.hpp +++ b/Runtime/Weapon/CGameProjectile.hpp @@ -72,7 +72,7 @@ public: void UpdateProjectileMovement(float dt, CStateManager& mgr); CRayCastResult DoCollisionCheck(TUniqueId& idOut, CStateManager& mgr); void ApplyDamageToActors(CStateManager& mgr, const CDamageInfo& dInfo); - void FluidFxThink(EFluidState state, CScriptWater& water, CStateManager& mgr); + void FluidFXThink(EFluidState state, CScriptWater& water, CStateManager& mgr) override; CRayCastResult RayCollisionCheckWithWorld(TUniqueId& idOut, const zeus::CVector3f& start, const zeus::CVector3f& end, float mag, const rstl::reserved_vector& nearList, CStateManager& mgr);