Merge branch 'master' into miami
# Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp
This commit is contained in:
@@ -80,6 +80,9 @@ CVehicle::CVehicle(uint8 CreatedBy)
|
||||
bIsLawEnforcer = false;
|
||||
bIsAmbulanceOnDuty = false;
|
||||
bIsFireTruckOnDuty = false;
|
||||
#ifdef FIX_BUGS
|
||||
bIsHandbrakeOn = false;
|
||||
#endif
|
||||
CCarCtrl::UpdateCarCount(this, false);
|
||||
m_fHealth = 1000.0f;
|
||||
bEngineOn = true;
|
||||
@@ -117,7 +120,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
|
||||
m_numPedsUseItAsCover = 0;
|
||||
bIsCarParkVehicle = false;
|
||||
bHasAlreadyBeenRecorded = false;
|
||||
m_bSirenOrAlarm = 0;
|
||||
m_bSirenOrAlarm = false;
|
||||
m_nCarHornTimer = 0;
|
||||
m_nCarHornPattern = 0;
|
||||
m_nCarHornDelay = 0;
|
||||
|
||||
Reference in New Issue
Block a user