mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-27 18:25:28 +00:00
Code Issues Projects Releases Wiki Activity

bikes in garages + bugfix

Browse source
This commit is contained in:
Nikolay Korolev 2020-06-18 00:03:43 +03:00
parent e44704dc82
commit e9e533b0cb
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/control/Garages.cpp
View file

@ -3,6 +3,7 @@
#include "Garages.h" #include "Garages.h"
#include "main.h" #include "main.h"
#include "Bike.h"
#ifdef FIX_BUGS #ifdef FIX_BUGS
#include "Boat.h" #include "Boat.h"
#endif #endif
@ -414,7 +415,8 @@ void CGarage::Update()
((CAutomobile*)(FindPlayerVehicle()))->Fix(); ((CAutomobile*)(FindPlayerVehicle()))->Fix();
} }
else { else {
// TODO(MIAMI): Bike Fix ((CBike*)(FindPlayerVehicle()))->m_fFireBlowUpTimer = 0.0f;
((CBike*)(FindPlayerVehicle()))->Fix();
} }
FindPlayerVehicle()->m_nDoorLock = CARLOCK_UNLOCKED; FindPlayerVehicle()->m_nDoorLock = CARLOCK_UNLOCKED;
++CStats::Sprayings; ++CStats::Sprayings;
@ -1792,7 +1794,12 @@ CVehicle* CStoredCar::RestoreCar()
CVehicle* pVehicle; CVehicle* pVehicle;
if (CModelInfo::IsBoatModel(m_nModelIndex)) if (CModelInfo::IsBoatModel(m_nModelIndex))
pVehicle = new CBoat(m_nModelIndex, RANDOM_VEHICLE); 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 else
pVehicle = new CAutomobile(m_nModelIndex, RANDOM_VEHICLE); pVehicle = new CAutomobile(m_nModelIndex, RANDOM_VEHICLE);
pVehicle->SetPosition(m_vecPos); pVehicle->SetPosition(m_vecPos);

2
src/control/Script.cpp
View file

@ -9976,7 +9976,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
} }
case COMMAND_GET_RANDOM_COP_IN_AREA: case COMMAND_GET_RANDOM_COP_IN_AREA:
{ {
CollectParameters(&m_nIp, 4); CollectParameters(&m_nIp, 9);
int ped_handle = -1; int ped_handle = -1;
CVector pos = FindPlayerCoors(); CVector pos = FindPlayerCoors();
float x1 = *(float*)&ScriptParams[0]; float x1 = *(float*)&ScriptParams[0];