summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-06-17 23:03:43 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-06-17 23:03:43 +0200
commite9e533b0cba04a06b6ac9dfaddee2ea4fa19a72d (patch)
tree9be2a2001756c45c7a14448554b8c2ff4759d238 /src/control
parentPed, Weapon and fixes (diff)
downloadre3-e9e533b0cba04a06b6ac9dfaddee2ea4fa19a72d.tar
re3-e9e533b0cba04a06b6ac9dfaddee2ea4fa19a72d.tar.gz
re3-e9e533b0cba04a06b6ac9dfaddee2ea4fa19a72d.tar.bz2
re3-e9e533b0cba04a06b6ac9dfaddee2ea4fa19a72d.tar.lz
re3-e9e533b0cba04a06b6ac9dfaddee2ea4fa19a72d.tar.xz
re3-e9e533b0cba04a06b6ac9dfaddee2ea4fa19a72d.tar.zst
re3-e9e533b0cba04a06b6ac9dfaddee2ea4fa19a72d.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Garages.cpp11
-rw-r--r--src/control/Script.cpp2
2 files changed, 10 insertions, 3 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 5d459b43..f0b924e6 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -3,6 +3,7 @@
#include "Garages.h"
#include "main.h"
+#include "Bike.h"
#ifdef FIX_BUGS
#include "Boat.h"
#endif
@@ -414,7 +415,8 @@ void CGarage::Update()
((CAutomobile*)(FindPlayerVehicle()))->Fix();
}
else {
- // TODO(MIAMI): Bike Fix
+ ((CBike*)(FindPlayerVehicle()))->m_fFireBlowUpTimer = 0.0f;
+ ((CBike*)(FindPlayerVehicle()))->Fix();
}
FindPlayerVehicle()->m_nDoorLock = CARLOCK_UNLOCKED;
++CStats::Sprayings;
@@ -1792,7 +1794,12 @@ CVehicle* CStoredCar::RestoreCar()
CVehicle* pVehicle;
if (CModelInfo::IsBoatModel(m_nModelIndex))
pVehicle = new CBoat(m_nModelIndex, RANDOM_VEHICLE);
- // else if bike - TODO(MIAMI)
+ else if (CModelInfo::IsBikeModel(m_nModelIndex))
+ {
+ CBike* pBike = new CBike(m_nModelIndex, RANDOM_VEHICLE);
+ pBike->bIsStanding = true;
+ pVehicle = pBike;
+ }
else
pVehicle = new CAutomobile(m_nModelIndex, RANDOM_VEHICLE);
pVehicle->SetPosition(m_vecPos);
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index f90e7fb5..117e8f1d 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -9976,7 +9976,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
}
case COMMAND_GET_RANDOM_COP_IN_AREA:
{
- CollectParameters(&m_nIp, 4);
+ CollectParameters(&m_nIp, 9);
int ped_handle = -1;
CVector pos = FindPlayerCoors();
float x1 = *(float*)&ScriptParams[0];