Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
This commit is contained in:
Sergeanur 2021-04-09 04:31:46 +03:00
commit 519218572a
16 changed files with 194 additions and 91 deletions

View file

@ -2549,7 +2549,7 @@ CBike::GetHeightAboveRoad(void)
void
CBike::PlayCarHorn(void)
{
int r;
uint32 r;
if (IsAlarmOn() || m_nCarHornTimer != 0)
return;