diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-17 20:43:11 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-17 20:43:11 +0200 |
| commit | a5b84eb9fe32689f0aee10077854a3652c986c08 (patch) | |
| tree | c8e5e5c72db293ca86bdadbc023f3997b05df947 /src/vehicles/Automobile.cpp | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.gz re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.bz2 re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.lz re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.xz re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.zst re3-a5b84eb9fe32689f0aee10077854a3652c986c08.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index d1f2faaa..8486d9e1 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -72,6 +72,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy) bFixedColour = false; bBigWheels = false; bWaterTight = false; + bTankDetonateCars = true; SetModelIndex(id); @@ -332,7 +333,7 @@ CAutomobile::ProcessControl(void) bool playerRemote = false; switch(GetStatus()){ case STATUS_PLAYER_REMOTE: - if(CPad::GetPad(0)->WeaponJustDown()){ + if(CPad::GetPad(0)->WeaponJustDown() && !bDisableRemoteDetonation){ BlowUpCar(FindPlayerPed()); CRemote::TakeRemoteControlledCarFromPlayer(); } @@ -4139,7 +4140,7 @@ CAutomobile::BlowUpCarsInPath(void) { int i; - if(m_vecMoveSpeed.Magnitude() > 0.1f) + if(m_vecMoveSpeed.Magnitude() > 0.1f && bTankDetonateCars) for(i = 0; i < m_nCollisionRecords; i++) if(m_aCollisionRecords[i] && m_aCollisionRecords[i]->IsVehicle() && @@ -4601,6 +4602,18 @@ CAutomobile::SetAllTaxiLights(bool set) m_sAllTaxiLights = set; } +void +CAutomobile::TellHeliToGoToCoors(float x, float y, float z, uint8 speed) +{ + AutoPilot.m_nCarMission = MISSION_HELI_FLYTOCOORS; + AutoPilot.m_vecDestinationCoors.x = x; + AutoPilot.m_vecDestinationCoors.y = y; + AutoPilot.m_vecDestinationCoors.z = z; + AutoPilot.m_nCruiseSpeed = speed; + SetStatus(STATUS_PHYSICS); + assert(0); // TODO(MIAMI) +} + #ifdef COMPATIBLE_SAVES void CAutomobile::Save(uint8*& buf) |