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

CEnergyProjectile: Minor cleanup

This commit is contained in:
Luke Street 2020-09-26 09:41:50 -04:00
parent 6b51f32f99
commit 902b5644f7
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Weapon/CEnergyProjectile.cpp
View File

@ -22,15 +22,11 @@ CEnergyProjectile::CEnergyProjectile(bool active, const TToken<CWeaponDescriptio
EProjectileAttrib attribs, bool underwater, const zeus::CVector3f& scale, EProjectileAttrib attribs, bool underwater, const zeus::CVector3f& scale,
const std::optional<TLockedToken<CGenDescription>>& visorParticle, u16 visorSfx, const std::optional<TLockedToken<CGenDescription>>& visorParticle, u16 visorSfx,
bool sendCollideMsg) bool sendCollideMsg)
: CGameProjectile(active, desc, "GameProjectile", type, xf, excludeMat, damage, uid, aid, owner, homingTarget, attribs, : CGameProjectile(active, desc, "GameProjectile"sv, type, xf, excludeMat, damage, uid, aid, owner, homingTarget, attribs,
underwater, scale, visorParticle, visorSfx, sendCollideMsg) underwater, scale, visorParticle, visorSfx, sendCollideMsg)
, x2ec_dir(xf.frontVector()) , x2ec_dir(xf.frontVector())
, x2f8_mag(x2ec_dir.magnitude()) , x2f8_mag(x2ec_dir.magnitude())
, x2fc_camShake(CCameraShakeData::BuildProjectileCameraShake(0.5f, 0.75f)) , x2fc_camShake(CCameraShakeData::BuildProjectileCameraShake(0.5f, 0.75f)) {
, x3d0_24_dead(false)
, x3d0_25_(false)
, x3d0_26_(false)
, x3d0_27_camShakeDirty(false) {
xe6_27_thermalVisorFlags = 2; xe6_27_thermalVisorFlags = 2;
} }

8
Runtime/Weapon/CEnergyProjectile.hpp
View File

@ -10,10 +10,10 @@ class CEnergyProjectile : public CGameProjectile {
zeus::CVector3f x2ec_dir; zeus::CVector3f x2ec_dir;
float x2f8_mag; float x2f8_mag;
CCameraShakeData x2fc_camShake; CCameraShakeData x2fc_camShake;
bool x3d0_24_dead : 1; bool x3d0_24_dead : 1 = false;
bool x3d0_25_ : 1; bool x3d0_25_ : 1 = false;
bool x3d0_26_ : 1; bool x3d0_26_ : 1 = false;
bool x3d0_27_camShakeDirty : 1; bool x3d0_27_camShakeDirty : 1 = false;
float x3d4_curTime = 0.f; float x3d4_curTime = 0.f;
void StopProjectile(CStateManager& mgr); void StopProjectile(CStateManager& mgr);