diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 13:01:32 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 13:01:32 +0200 |
| commit | c33b93793f71a8cdcdf9d8cbbc69f8873f45113a (patch) | |
| tree | 1e6ff19cc88988720ab5d3f43e62d4682b3ddde5 /src/vehicles/Automobile.cpp | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-c33b93793f71a8cdcdf9d8cbbc69f8873f45113a.tar re3-c33b93793f71a8cdcdf9d8cbbc69f8873f45113a.tar.gz re3-c33b93793f71a8cdcdf9d8cbbc69f8873f45113a.tar.bz2 re3-c33b93793f71a8cdcdf9d8cbbc69f8873f45113a.tar.lz re3-c33b93793f71a8cdcdf9d8cbbc69f8873f45113a.tar.xz re3-c33b93793f71a8cdcdf9d8cbbc69f8873f45113a.tar.zst re3-c33b93793f71a8cdcdf9d8cbbc69f8873f45113a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 6e88b997..d1f2faaa 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -4024,10 +4024,22 @@ CAutomobile::PlayCarHorn(void) { int r; + if (m_nAlarmState && m_nAlarmState != -1) + return; + + if (GetStatus() == STATUS_WRECKED) + return; + if(m_nCarHornTimer != 0) return; - r = CGeneral::GetRandomNumber() & 7; + if (m_nCarHornDelay) { + m_nCarHornDelay--; + return; + } + + m_nCarHornDelay = (CGeneral::GetRandomNumber() & 0x7F) + 150; + r = m_nCarHornDelay & 7; if(r < 2){ m_nCarHornTimer = 45; }else if(r < 4){ |