archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-26 03:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
This commit is contained in:
Sergeanur
2021-04-09 04:31:46 +03:00
parent 49b3bf5f2e ceb22d71dd
commit 519218572a
16 changed files with 194 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vehicles/Automobile.cpp
View File

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

2
src/vehicles/Bike.cpp
View File

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