diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-02-22 16:47:58 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-22 16:47:58 +0100 |
| commit | 82ebd8aae1c64f149877897dd1862bf83cad7e5a (patch) | |
| tree | 335e514203ade1cd44f9f38c6cfbc289cba84ea9 | |
| parent | Merge pull request 'Fix potential stack corruption in HandleGraphEvent in 64bit arch' (#2) from HaydnTrigg/re3:master into master (diff) | |
| download | re3-82ebd8aae1c64f149877897dd1862bf83cad7e5a.tar re3-82ebd8aae1c64f149877897dd1862bf83cad7e5a.tar.gz re3-82ebd8aae1c64f149877897dd1862bf83cad7e5a.tar.bz2 re3-82ebd8aae1c64f149877897dd1862bf83cad7e5a.tar.lz re3-82ebd8aae1c64f149877897dd1862bf83cad7e5a.tar.xz re3-82ebd8aae1c64f149877897dd1862bf83cad7e5a.tar.zst re3-82ebd8aae1c64f149877897dd1862bf83cad7e5a.zip | |
| -rw-r--r-- | src/vehicles/Automobile.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 4863b945..c2cf26b9 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -333,7 +333,11 @@ CAutomobile::ProcessControl(void) bool playerRemote = false; switch(GetStatus()){ case STATUS_PLAYER_REMOTE: - if(CPad::GetPad(0)->WeaponJustDown()){ +#ifdef FIX_BUGS + if (CPad::GetPad(0)->CarGunJustDown()) { +#else + if (CPad::GetPad(0)->WeaponJustDown()) { +#endif BlowUpCar(FindPlayerPed()); CRemote::TakeRemoteControlledCarFromPlayer(); } @@ -2372,7 +2376,11 @@ void CAutomobile::FireTruckControl(void) { if(this == FindPlayerVehicle()){ - if(!CPad::GetPad(0)->GetWeapon()) +#ifdef FIX_BUGS + if (!CPad::GetPad(0)->GetCarGunFired()) +#else + if (!CPad::GetPad(0)->GetWeapon()) +#endif // FIX_BUGS return; #ifdef FREE_CAM if (!CCamera::bFreeCam) @@ -3054,7 +3062,7 @@ CAutomobile::DoDriveByShootings(void) lookingLeft = true; if(TheCamera.Cams[TheCamera.ActiveCam].LookingRight) lookingRight = true; - } + } if(lookingLeft || lookingRight){ if(lookingLeft){ |