7 files changed, 10 insertions, 4 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index cc360f79..df1dcd63 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -142,8 +142,8 @@ CCollision::LoadCollisionWhenINeedIt(bool forceChange)
 
 	veh = FindPlayerVehicle();
 	if(veh && veh->IsTrain()){
-		if(((CTrain*)veh)->m_doorState != TRAIN_DOOR_STATE2)
-			return ;
+		if(((CTrain*)veh)->m_nDoorState != TRAIN_DOOR_OPEN)
+			return;
 	}else if(playerCoors.z < 4.0f && !CCullZones::DoINeedToLoadCollision())
 		return;
 
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 14dc91cd..e9c06201 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -744,7 +744,7 @@ CFileLoader::LoadVehicleObject(const char *line)
 	}else if(strncmp(type, "heli", 5) == 0){
 		mi->m_vehicleType = VEHICLE_TYPE_HELI;
 	}else if(strncmp(type, "plane", 6) == 0){
-		mi->m_wheelId = misc;
+		mi->m_planeLodId = misc;
 		mi->m_wheelScale = 1.0f;
 		mi->m_vehicleType = VEHICLE_TYPE_PLANE;
 	}else if(strncmp(type, "bike", 5) == 0){
diff --git a/src/core/Wanted.h b/src/core/Wanted.h
index 1a72f839..7cd89b7e 100644
--- a/src/core/Wanted.h
+++ b/src/core/Wanted.h
@@ -33,6 +33,9 @@ public:
 	CVector m_vecPosn;
 	bool m_bReported;
 	bool m_bPoliceDoesntCare;
+
+	CCrimeBeingQd() { };
+	~CCrimeBeingQd() { };
 };
 
 class CWanted
diff --git a/src/core/ZoneCull.cpp b/src/core/ZoneCull.cpp
index 90155bcf..dc162147 100644
--- a/src/core/ZoneCull.cpp
+++ b/src/core/ZoneCull.cpp
@@ -186,7 +186,7 @@ CCullZones::MarkSubwayAsInvisible(bool visible)
 	n = CPools::GetVehiclePool()->GetSize();
 	for(i = 0; i < n; i++){
 		v = CPools::GetVehiclePool()->GetSlot(i);
-		if(v && v->IsTrain() && ((CTrain*)v)->m_trackId != 0)
+		if(v && v->IsTrain() && ((CTrain*)v)->m_nTrackId != TRACK_ELTRAIN)
 			v->bIsVisible = visible;
 	}
 }
diff --git a/src/core/config.h b/src/core/config.h
index 07c86c0d..52d1dab8 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -123,3 +123,4 @@ enum Config {
 #define KANGAROO_CHEAT
 #define ASPECT_RATIO_SCALE
 #define USE_DEBUG_SCRIPT_LOADER
+#define EXPLODING_AIRTRAIN	// can blow up jumbo jet with rocket launcher
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 04fee197..a4c4de7b 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -71,6 +71,7 @@ char version_name[64];
 float FramesPerSecond = 30.0f;
 
 bool gbPrintShite = false;
+bool gbModelViewer;
 
 bool DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
 void DoRWStuffEndOfFrame(void);
diff --git a/src/core/main.h b/src/core/main.h
index 9b3c27f5..6d393066 100644
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -18,6 +18,7 @@ extern wchar *gUString;
 extern wchar *gUString2;
 extern bool &b_FoundRecentSavedGameWantToLoad;
 extern bool gbPrintShite;
+extern bool gbModelViewer;
 
 class CSprite2d;