diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-10-18 16:15:49 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-10-18 16:15:49 +0200 |
| commit | 0d20f1c364e23ff68c26b77632f0fb80c0e54799 (patch) | |
| tree | d22ab7f9ce5c336c3a112aaeff8bcb5a7e2db672 /src/weapons/Weapon.cpp | |
| parent | Attractor obj. fixes (diff) | |
| parent | lil fix (diff) | |
| download | re3-0d20f1c364e23ff68c26b77632f0fb80c0e54799.tar re3-0d20f1c364e23ff68c26b77632f0fb80c0e54799.tar.gz re3-0d20f1c364e23ff68c26b77632f0fb80c0e54799.tar.bz2 re3-0d20f1c364e23ff68c26b77632f0fb80c0e54799.tar.lz re3-0d20f1c364e23ff68c26b77632f0fb80c0e54799.tar.xz re3-0d20f1c364e23ff68c26b77632f0fb80c0e54799.tar.zst re3-0d20f1c364e23ff68c26b77632f0fb80c0e54799.zip | |
Diffstat (limited to 'src/weapons/Weapon.cpp')
| -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 48f90897..5d9686b5 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -1526,14 +1526,14 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim, if ( !victimObject->bInfiniteMass && victimObject->m_fCollisionDamageMultiplier < 99.9f) { - bool notStatic = !victimObject->IsStatic(); + bool notStatic = !victimObject->GetIsStatic(); if (notStatic && victimObject->m_fUprootLimit <= 0.0f) { - victimObject->bIsStatic = false; + victimObject->SetIsStatic(false); victimObject->AddToMovingList(); } - notStatic = !victimObject->IsStatic(); + notStatic = !victimObject->GetIsStatic(); if (!notStatic) { CVector moveForce = point->normal * -4.0f; @@ -1922,14 +1922,14 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource) if ( !victimObject->bInfiniteMass ) { - bool notStatic = !victimObject->IsStatic(); + bool notStatic = !victimObject->GetIsStatic(); if ( notStatic && victimObject->m_fUprootLimit <= 0.0f ) { - victimObject->bIsStatic = false; + victimObject->SetIsStatic(false); victimObject->AddToMovingList(); } - notStatic = !victimObject->IsStatic(); + notStatic = !victimObject->GetIsStatic(); if ( !notStatic ) { CVector moveForce = point.normal*-5.0f; @@ -3149,9 +3149,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(); } } |