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

General: Use bool literals where applicable 

More indicative of the passed in type compared to raw values.
This commit is contained in:
Lioncash 2020-04-17 17:39:04 -04:00
parent 75e5851e5b
commit 76f0b57340
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/CPlayerGun.cpp
View File

@ -124,7 +124,7 @@ float CPlayerGun::CMotionState::gGunExtendDistance = 0.125f;
float CPlayerGun::skTractorBeamFactor = 0.5f / CPlayerState::GetMissileComboChargeFactor(); float CPlayerGun::skTractorBeamFactor = 0.5f / CPlayerState::GetMissileComboChargeFactor();
CPlayerGun::CPlayerGun(TUniqueId playerId) CPlayerGun::CPlayerGun(TUniqueId playerId)
: x0_lights(8, zeus::CVector3f{-30.f, 0.f, 30.f}, 4, 4, 0, 0, 0, 0.1f) : x0_lights(8, zeus::CVector3f{-30.f, 0.f, 30.f}, 4, 4, false, 0, 0, 0.1f)
, x538_playerId(playerId) , x538_playerId(playerId)
, x550_camBob(CPlayerCameraBob::ECameraBobType::One, CPlayerCameraBob::GetCameraBobExtent(), , x550_camBob(CPlayerCameraBob::ECameraBobType::One, CPlayerCameraBob::GetCameraBobExtent(),
CPlayerCameraBob::GetCameraBobPeriod()) CPlayerCameraBob::GetCameraBobPeriod())

2
Runtime/World/CScriptTrigger.cpp
View File

@ -255,7 +255,7 @@ void CScriptTrigger::Touch(CActor& act, CStateManager& mgr) {
x148_29_didPhazonDamage = false; x148_29_didPhazonDamage = false;
} else if (x100_damageInfo.GetDamage() > 0.f) { } else if (x100_damageInfo.GetDamage() > 0.f) {
const CDamageVulnerability* dVuln = mgr.Player()->GetDamageVulnerability(); const CDamageVulnerability* dVuln = mgr.Player()->GetDamageVulnerability();
if (dVuln->WeaponHurts(x100_damageInfo.GetWeaponMode(), 0) && if (dVuln->WeaponHurts(x100_damageInfo.GetWeaponMode(), false) &&
x100_damageInfo.GetWeaponMode().GetType() == EWeaponType::Phazon && x100_damageInfo.GetWeaponMode().GetType() == EWeaponType::Phazon &&
!mgr.GetPlayerState()->HasPowerUp(CPlayerState::EItemType::PhazonSuit)) { !mgr.GetPlayerState()->HasPowerUp(CPlayerState::EItemType::PhazonSuit)) {
pl->IncrementEnvironmentDamage(); pl->IncrementEnvironmentDamage();