AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #36 from lioncash/virt-func 

Runtime/Weapon/CGameProjectile: Fix misnamed virtual function
This commit is contained in:
Phillip Stephens 2019-08-13 23:03:40 -07:00 committed by GitHub
parent 7eb3bce499 09f917a9aa
commit cf294db9eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Weapon/CGameProjectile.cpp
View File

@ -229,7 +229,7 @@ void CGameProjectile::ApplyDamageToActors(CStateManager& mgr, const CDamageInfo&
x2d0_touchResults.clear(); 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) if (x170_projectile.GetWeaponDescription()->xa6_SWTR)
CWeapon::FluidFXThink(state, water, mgr); CWeapon::FluidFXThink(state, water, mgr);
} }

2
Runtime/Weapon/CGameProjectile.hpp
View File

@ -72,7 +72,7 @@ public:
void UpdateProjectileMovement(float dt, CStateManager& mgr); void UpdateProjectileMovement(float dt, CStateManager& mgr);
CRayCastResult DoCollisionCheck(TUniqueId& idOut, CStateManager& mgr); CRayCastResult DoCollisionCheck(TUniqueId& idOut, CStateManager& mgr);
void ApplyDamageToActors(CStateManager& mgr, const CDamageInfo& dInfo); 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, CRayCastResult RayCollisionCheckWithWorld(TUniqueId& idOut, const zeus::CVector3f& start, const zeus::CVector3f& end,
float mag, const rstl::reserved_vector<TUniqueId, 1024>& nearList, float mag, const rstl::reserved_vector<TUniqueId, 1024>& nearList,
CStateManager& mgr); CStateManager& mgr);