diff options
author | eray orçunus <erayorcunus@gmail.com> | 2020-05-19 16:46:18 +0200 |
---|---|---|
committer | eray orçunus <erayorcunus@gmail.com> | 2020-05-19 16:46:18 +0200 |
commit | 99574ebfc61a79b34f4681eaa2debefbae174875 (patch) | |
tree | a3edae2913a4af9682f7ecfec53367a484c2975c /src/vehicles/Automobile.cpp | |
parent | Melee weapons(half-working), Ped and Hud bits (diff) | |
parent | Merge pull request #564 from Xinerki/miami (diff) | |
download | re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.gz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.bz2 re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.lz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.xz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.zst re3-99574ebfc61a79b34f4681eaa2debefbae174875.zip |
Diffstat (limited to 'src/vehicles/Automobile.cpp')
-rw-r--r-- | src/vehicles/Automobile.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 5f78e2a9..e0ee0296 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(); } @@ -864,8 +865,14 @@ CAutomobile::ProcessControl(void) CVector wheelFwd = GetForward(); CVector wheelRight = GetRight(); +#ifdef FIX_BUGS + // Not sure if this is needed, but brake usually has timestep as a factor + if(bIsHandbrakeOn) + brake = 20000.0f * CTimer::GetTimeStepFix(); +#else if(bIsHandbrakeOn) brake = 20000.0f; +#endif if(m_aWheelTimer[CARWHEEL_REAR_LEFT] > 0.0f){ if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier)) @@ -4148,7 +4155,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() && @@ -4610,6 +4617,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); + //TODO(MIAMI) +} + #ifdef COMPATIBLE_SAVES void CAutomobile::Save(uint8*& buf) |