diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-11 20:42:34 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-11 20:42:34 +0200 |
| commit | 05b01c5ff528a8fc32ac92436f3b48d5c1529415 (patch) | |
| tree | b5a12cbcb1e1daab670ada7ee728d5eda43fc9b6 /src/vehicles/Vehicle.cpp | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| download | re3-05b01c5ff528a8fc32ac92436f3b48d5c1529415.tar re3-05b01c5ff528a8fc32ac92436f3b48d5c1529415.tar.gz re3-05b01c5ff528a8fc32ac92436f3b48d5c1529415.tar.bz2 re3-05b01c5ff528a8fc32ac92436f3b48d5c1529415.tar.lz re3-05b01c5ff528a8fc32ac92436f3b48d5c1529415.tar.xz re3-05b01c5ff528a8fc32ac92436f3b48d5c1529415.tar.zst re3-05b01c5ff528a8fc32ac92436f3b48d5c1529415.zip | |
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 5f7b6c56..49f21c01 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -434,24 +434,26 @@ CVehicle::UsesSiren(uint32 id) bool CVehicle::IsVehicleNormal(void) { - if(pDriver && m_nNumPassengers == 0 && m_status != STATUS_WRECKED){ - switch(GetModelIndex()) - case MI_FIRETRUCK: - case MI_AMBULAN: - case MI_TAXI: - case MI_POLICE: - case MI_ENFORCER: - case MI_BUS: - case MI_RHINO: - case MI_BARRACKS: - case MI_DODO: - case MI_COACH: - case MI_CABBIE: - case MI_RCBANDIT: - case MI_BORGNINE: - return false; + if (!pDriver || m_nNumPassengers != 0 || m_status == STATUS_WRECKED) + return false; + switch (GetModelIndex()){ + case MI_FIRETRUCK: + case MI_AMBULAN: + case MI_TAXI: + case MI_POLICE: + case MI_ENFORCER: + case MI_BUS: + case MI_RHINO: + case MI_BARRACKS: + case MI_DODO: + case MI_COACH: + case MI_CABBIE: + case MI_RCBANDIT: + case MI_BORGNINE: + return false; + default: + return true; } - return false; } bool |