Merge remote-tracking branch 'upstream/master' into script_dev

This commit is contained in:
Nikolay Korolev 2020-01-01 16:01:06 +03:00
commit c05c516ce7

View File

@ -435,7 +435,7 @@ CPlayerInfo::Process(void)
if (CPad::GetPad(0)->ExitVehicleJustDown()) { if (CPad::GetPad(0)->ExitVehicleJustDown()) {
bool weAreOnBoat = false; bool weAreOnBoat = false;
float lastClosestness = 0.0f; float lastClosestness = 0.0f;
CVehicle *carBelow; CVehicle *carBelow = nil;
CEntity *surfaceBelow = m_pPed->m_pCurrentPhysSurface; CEntity *surfaceBelow = m_pPed->m_pCurrentPhysSurface;
if (surfaceBelow && surfaceBelow->IsVehicle()) { if (surfaceBelow && surfaceBelow->IsVehicle()) {
carBelow = (CVehicle*)surfaceBelow; carBelow = (CVehicle*)surfaceBelow;