7 files changed, 13 insertions, 14 deletions

diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index d54c2291..6f00a2ea 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -5824,7 +5824,7 @@ CAutomobile::KnockPedOutCar(eWeaponType weapon, uint16 door, CPed *ped)
 	if(ped == nil)
 		return;
 
-	ped->m_vehDoor = door;
+	ped->m_vehEnterType = door;
 	ped->SetPedState(PED_IDLE);
 	CAnimManager::BlendAnimation(ped->GetClump(), ped->m_animGroup, ANIM_IDLE_STANCE, 100.0f);
 	CPed::PedSetOutCarCB(nil, ped);
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index 293cf58e..bb613617 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -2609,7 +2609,7 @@ CBike::KnockOffRider(eWeaponType weapon, uint8 direction, CPed *ped, bool bGetBa
 
 	ped->SetPedState(PED_IDLE);
 	CAnimManager::BlendAnimation(ped->GetClump(), ped->m_animGroup, ANIM_IDLE_STANCE, 100.0f);
-	ped->m_vehDoor = CAR_DOOR_LF;
+	ped->m_vehEnterType = CAR_DOOR_LF;
 	CPed::PedSetOutCarCB(nil, ped);
 	ped->SetMoveState(PEDMOVE_STILL);
 	if(GetUp().z < 0.0f)
diff --git a/src/vehicles/Cranes.h b/src/vehicles/Cranes.h
index e842ed3f..162f9af9 100644
--- a/src/vehicles/Cranes.h
+++ b/src/vehicles/Cranes.h
@@ -88,7 +88,7 @@ public:
 	static bool IsThisCarBeingCarriedByAnyCrane(CVehicle* pVehicle);
 	static bool IsThisCarBeingTargettedByAnyCrane(CVehicle* pVehicle);
 	static void Save(uint8* buf, uint32* size);
-	static void Load(uint8* buf, uint32 size); // out of class in III PC and later because of SecuROM
+	static void Load(uint8* buf, uint32 size); // on mobile it's CranesLoad outside of the class
 
 	static uint32 CarsCollectedMilitaryCrane;
 	static int32 NumCranes;
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index 1c1b2617..644fdde8 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -762,7 +762,7 @@ CHeli::InitHelis(void)
 }
 
 CHeli*
-CHeli::GenerateHeli(bool catalina)
+GenerateHeli(bool catalina)
 {
 	CHeli *heli;
 	CVector heliPos;
@@ -800,7 +800,7 @@ CHeli::GenerateHeli(bool catalina)
 		id++;
 		found = true;
 		for(i = 0; i < 4; i++)
-			if(pHelis[i] && pHelis[i]->m_nHeliId == id)
+			if(CHeli::pHelis[i] && CHeli::pHelis[i]->m_nHeliId == id)
 				found = false;
 	}
 	heli->m_nHeliId = id;
diff --git a/src/vehicles/Heli.h b/src/vehicles/Heli.h
index c5ae08e2..1f372e42 100644
--- a/src/vehicles/Heli.h
+++ b/src/vehicles/Heli.h
@@ -83,14 +83,13 @@ public:
 	bool SendDownSwat(void);
 
 	static void InitHelis(void);
-	static CHeli *GenerateHeli(bool catalina); // out of class in III PC and later because of SecuROM
 	static void UpdateHelis(void);
 	static void SpecialHeliPreRender(void);
 	static bool TestRocketCollision(CVector *coors);
 	static bool TestBulletCollision(CVector *line0, CVector *line1, CVector *bulletPos, int32 damage);
 	static bool TestSniperCollision(CVector *line0, CVector *line1);
 
-	static void StartCatalinaFlyBy(void); // out of class in III PC and later because of SecuROM
+	static void StartCatalinaFlyBy(void);
 	static void RemoveCatalinaHeli(void);
 	static CHeli *FindPointerToCatalinasHeli(void);
 	static void CatalinaTakeOff(void);
diff --git a/src/vehicles/Train.cpp b/src/vehicles/Train.cpp
index 55be4a20..fefe1781 100644
--- a/src/vehicles/Train.cpp
+++ b/src/vehicles/Train.cpp
@@ -388,7 +388,7 @@ void
 CTrain::AddPassenger(CPed *ped)
 {
 #ifdef GTA_TRAIN
-	int i = ped->m_vehDoor;
+	int i = ped->m_vehEnterType;
 	if((i == TRAIN_POS_LEFT_ENTRY || i == TRAIN_POS_MID_ENTRY || i == TRAIN_POS_RIGHT_ENTRY) && pPassengers[i] == nil){
 		pPassengers[i] = ped;
 		m_nNumPassengers++;
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 145611b1..e1e00667 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -1430,13 +1430,13 @@ CVehicle::ShufflePassengersToMakeSpace(void)
 		if (!pPassengers[2] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RR)) {
 			pPassengers[2] = pPassengers[1];
 			pPassengers[1] = nil;
-			pPassengers[2]->m_vehDoor = CAR_DOOR_RR;
+			pPassengers[2]->m_vehEnterType = CAR_DOOR_RR;
 			return true;
 		}
 		if (!pPassengers[0] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RF)) {
 			pPassengers[0] = pPassengers[1];
 			pPassengers[1] = nil;
-			pPassengers[0]->m_vehDoor = CAR_DOOR_RF;
+			pPassengers[0]->m_vehEnterType = CAR_DOOR_RF;
 			return true;
 		}
 		return false;
@@ -1447,13 +1447,13 @@ CVehicle::ShufflePassengersToMakeSpace(void)
 		if (!pPassengers[1] && !(m_nGettingInFlags & CAR_DOOR_FLAG_LR)) {
 			pPassengers[1] = pPassengers[2];
 			pPassengers[2] = nil;
-			pPassengers[1]->m_vehDoor = CAR_DOOR_LR;
+			pPassengers[1]->m_vehEnterType = CAR_DOOR_LR;
 			return true;
 		}
 		if (!pPassengers[0] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RF)) {
 			pPassengers[0] = pPassengers[2];
 			pPassengers[2] = nil;
-			pPassengers[0]->m_vehDoor = CAR_DOOR_RF;
+			pPassengers[0]->m_vehEnterType = CAR_DOOR_RF;
 			return true;
 		}
 		return false;
@@ -1464,13 +1464,13 @@ CVehicle::ShufflePassengersToMakeSpace(void)
 		if (!pPassengers[1] && !(m_nGettingInFlags & CAR_DOOR_FLAG_LR)) {
 			pPassengers[1] = pPassengers[0];
 			pPassengers[0] = nil;
-			pPassengers[1]->m_vehDoor = CAR_DOOR_LR;
+			pPassengers[1]->m_vehEnterType = CAR_DOOR_LR;
 			return true;
 		}
 		if (!pPassengers[2] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RR)) {
 			pPassengers[2] = pPassengers[0];
 			pPassengers[0] = nil;
-			pPassengers[2]->m_vehDoor = CAR_DOOR_RR;
+			pPassengers[2]->m_vehEnterType = CAR_DOOR_RR;
 			return true;
 		}
 		return false;