diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-06 18:32:57 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-06 18:32:57 +0200 |
| commit | 6ad66fb2d78360053febb3369a7ec448ffec73fd (patch) | |
| tree | 6c0f21a5f8ecc2cb7facd55f3944b65c1c3a6d0e /src/weapons/Weapon.cpp | |
| parent | CSphere and CBox for CColModel (diff) | |
| parent | Merge pull request #517 from Nick007J/master (diff) | |
| download | re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.gz re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.bz2 re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.lz re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.xz re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.zst re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.zip | |
Diffstat (limited to 'src/weapons/Weapon.cpp')
| -rw-r--r-- | src/weapons/Weapon.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index e9b917de..17ce64c0 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -1047,13 +1047,13 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim, if ( !victimObject->bInfiniteMass ) { - if ( victimObject->bIsStatic && victimObject->m_fUprootLimit <= 0.0f ) + if ( victimObject->IsStatic() && victimObject->m_fUprootLimit <= 0.0f ) { victimObject->bIsStatic = false; victimObject->AddToMovingList(); } - if ( !victimObject->bIsStatic ) + if ( !victimObject->IsStatic()) { CVector moveForce = point->normal*-4.0f; victimObject->ApplyMoveForce(moveForce.x, moveForce.y, moveForce.z); @@ -1296,13 +1296,13 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource) if ( !victimObject->bInfiniteMass ) { - if ( victimObject->bIsStatic && victimObject->m_fUprootLimit <= 0.0f ) + if ( victimObject->IsStatic() && victimObject->m_fUprootLimit <= 0.0f ) { victimObject->bIsStatic = false; victimObject->AddToMovingList(); } - if ( !victimObject->bIsStatic ) + if ( !victimObject->IsStatic()) { CVector moveForce = point.normal*-5.0f; victimObject->ApplyMoveForce(moveForce.x, moveForce.y, moveForce.z); @@ -2232,7 +2232,7 @@ 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->bIsStatic ) + if ( object->IsStatic()) { object->bIsStatic = false; object->AddToMovingList(); |