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

Merge pull request #214 from lioncash/virtual 

CGunWeapon: Make destructor virtual
This commit is contained in:
Phillip Stephens 2020-03-12 15:11:02 -07:00 committed by GitHub
parent 97e33bdf11 2c091ac124
commit eb38d96d9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Weapon/CGunWeapon.cpp
View File

@ -75,6 +75,8 @@ CGunWeapon::CGunWeapon(CAssetId ancsId, EWeaponType type, TUniqueId playerId, EM
BuildDependencyList(x200_beamId); BuildDependencyList(x200_beamId);
} }
CGunWeapon::~CGunWeapon() = default;
void CGunWeapon::AllocResPools(CPlayerState::EBeamId beam) { void CGunWeapon::AllocResPools(CPlayerState::EBeamId beam) {
const auto& wPair = g_tweakGunRes->GetWeaponPair(beam); const auto& wPair = g_tweakGunRes->GetWeaponPair(beam);
const char* const* muzzleNames = &skMuzzleNames[size_t(beam) * 2]; const char* const* muzzleNames = &skMuzzleNames[size_t(beam) * 2];

2
Runtime/Weapon/CGunWeapon.hpp
View File

@ -116,6 +116,8 @@ protected:
public: public:
CGunWeapon(CAssetId ancsId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, CGunWeapon(CAssetId ancsId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial,
const zeus::CVector3f& scale); const zeus::CVector3f& scale);
virtual ~CGunWeapon();
void AsyncLoadSuitArm(CStateManager& mgr); void AsyncLoadSuitArm(CStateManager& mgr);
virtual void Reset(CStateManager& mgr); virtual void Reset(CStateManager& mgr);
virtual void PlayAnim(NWeaponTypes::EGunAnimType type, bool loop); virtual void PlayAnim(NWeaponTypes::EGunAnimType type, bool loop);