diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-10-18 15:40:06 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-10-18 15:40:06 +0200 |
| commit | b91f6a45501634b55f6ef2c08d57c5293d5fd3a0 (patch) | |
| tree | 34cdedbe9dda385d48a416d1c26ef220132d35f0 /src/weapons/Weapon.cpp | |
| parent | Cleanup breaks CAutomobile::ProcessOpenDoor (diff) | |
| download | re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.gz re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.bz2 re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.lz re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.xz re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.zst re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/weapons/Weapon.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index 37f59c95..85f0bc15 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -1057,13 +1057,13 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim, if ( !victimObject->bInfiniteMass ) { - if ( victimObject->IsStatic() && victimObject->m_fUprootLimit <= 0.0f ) + if ( victimObject->GetIsStatic() && victimObject->m_fUprootLimit <= 0.0f ) { - victimObject->bIsStatic = false; + victimObject->SetIsStatic(false); victimObject->AddToMovingList(); } - if ( !victimObject->IsStatic()) + if ( !victimObject->GetIsStatic()) { CVector moveForce = point->normal*-4.0f; victimObject->ApplyMoveForce(moveForce.x, moveForce.y, moveForce.z); @@ -1316,13 +1316,13 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource) if ( !victimObject->bInfiniteMass ) { - if ( victimObject->IsStatic() && victimObject->m_fUprootLimit <= 0.0f ) + if ( victimObject->GetIsStatic() && victimObject->m_fUprootLimit <= 0.0f ) { - victimObject->bIsStatic = false; + victimObject->SetIsStatic(false); victimObject->AddToMovingList(); } - if ( !victimObject->IsStatic()) + if ( !victimObject->GetIsStatic()) { CVector moveForce = point.normal*-5.0f; victimObject->ApplyMoveForce(moveForce.x, moveForce.y, moveForce.z); @@ -2258,9 +2258,9 @@ CWeapon::BlowUpExplosiveThings(CEntity *thing) object->m_vecMoveSpeed.x += float((CGeneral::GetRandomNumber()&255) - 128) * 0.0002f; object->m_vecMoveSpeed.y += float((CGeneral::GetRandomNumber()&255) - 128) * 0.0002f; - if ( object->IsStatic()) + if ( object->GetIsStatic()) { - object->bIsStatic = false; + object->SetIsStatic(false); object->AddToMovingList(); } } |