diff options
| author | aap <aap@papnet.eu> | 2021-08-04 13:54:04 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-08-04 13:54:04 +0200 |
| commit | 4f461bd7bee01bdfdbbdef2d999fd44fa7198415 (patch) | |
| tree | faafcabaeb889161b6ff5f5d1cb8a0766932a1b9 /src/vehicles/Vehicle.cpp | |
| parent | CPhysical fixes and cleanup (diff) | |
| download | re3-4f461bd7bee01bdfdbbdef2d999fd44fa7198415.tar re3-4f461bd7bee01bdfdbbdef2d999fd44fa7198415.tar.gz re3-4f461bd7bee01bdfdbbdef2d999fd44fa7198415.tar.bz2 re3-4f461bd7bee01bdfdbbdef2d999fd44fa7198415.tar.lz re3-4f461bd7bee01bdfdbbdef2d999fd44fa7198415.tar.xz re3-4f461bd7bee01bdfdbbdef2d999fd44fa7198415.tar.zst re3-4f461bd7bee01bdfdbbdef2d999fd44fa7198415.zip | |
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 4259f9d8..451f3a39 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -527,7 +527,8 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon #ifdef FIX_BUGS // contactSpeedFwd is independent of framerate but fwd has timestep as a factor // so we probably have to fix this - fwd *= CTimer::GetTimeStepFix(); + // better get rid of it here too + //fwd *= CTimer::GetTimeStepFix(); #endif if(!bBraking){ @@ -860,12 +861,11 @@ CVehicle::ProcessDelayedExplosion(void) if(IsCar() && ((CAutomobile*)this)->m_bombType == CARBOMB_TIMEDACTIVE && (m_nBombTimer & 0xFE00) != (prev & 0xFE00)) DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_BOMB_TICK, 0.0f); - if (m_nBombTimer != 0) - return; - - if(FindPlayerVehicle() != this && m_pBlowUpEntity == FindPlayerPed()) - CWorld::Players[CWorld::PlayerInFocus].AwardMoneyForExplosion(this); - BlowUpCar(m_pBlowUpEntity); + if (m_nBombTimer == 0){ + if(FindPlayerVehicle() != this && m_pBlowUpEntity == FindPlayerPed()) + CWorld::Players[CWorld::PlayerInFocus].AwardMoneyForExplosion(this); + BlowUpCar(m_pBlowUpEntity); + } } bool @@ -1207,7 +1207,7 @@ CVehicle::ProcessCarAlarm(void) { uint32 step; - if(!IsAlarmOn()) + if(m_nAlarmState == 0 || m_nAlarmState == -1) return; step = CTimer::GetTimeStepInMilliseconds(); |