diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 16:14:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-05 16:14:13 +0200 |
commit | dfe0642195bd17704aaac669908c8bb29fbcb531 (patch) | |
tree | 99f4d7dec983e7ad6f4071cc259c8c0de2eda2e2 /src/vehicles/Vehicle.cpp | |
parent | Merge pull request #510 from aap/master (diff) | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
download | re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.gz re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.bz2 re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.lz re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.xz re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.zst re3-dfe0642195bd17704aaac669908c8bb29fbcb531.zip |
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
-rw-r--r-- | src/vehicles/Vehicle.cpp | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 75f43515..67024782 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -98,7 +98,10 @@ CVehicle::CVehicle(uint8 CreatedBy) bHasAlreadyBeenRecorded = false; m_bSirenOrAlarm = 0; m_nCarHornTimer = 0; - field_22D = 0; + m_nCarHornPattern = 0; +#ifdef MIAMI + bParking = false; +#endif m_nAlarmState = 0; m_nDoorLock = CARLOCK_UNLOCKED; m_nLastWeaponDamage = -1; @@ -118,6 +121,9 @@ CVehicle::CVehicle(uint8 CreatedBy) AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds(); AutoPilot.m_bStayInCurrentLevel = false; AutoPilot.m_bIgnorePathfinding = false; +#ifdef MIAMI + AutoPilot.m_nSwitchDistance = 20; +#endif } CVehicle::~CVehicle() @@ -1347,3 +1353,23 @@ CVehicle::Load(uint8*& buf) SkipSaveBuf(buf, 99); } #endif + +#ifdef MIAMI +eVehicleAppearance +//--MIAMI: TODO, implement VC version, appearance != type +// This would work for cars, boats and bikes but not for planes and helis +CVehicle::GetVehicleAppearance(void) +{ + if (IsCar()) + return VEHICLE_CAR; + if (IsBoat()) + return VEHICLE_BOAT; + if (IsBike()) + return VEHICLE_BIKE; + if (IsPlane()) + return VEHICLE_PLANE; + if (IsHeli()) + return VEHICLE_HELI; + return VEHICLE_NONE; +} +#endif |