From fef87b9219af21a1b2491c1aa7a8d2e9a2353b94 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Mon, 25 Jan 2021 10:43:12 +0100
Subject: [PATCH] fix some breakage

---
 src/collision/ColModel.cpp         | 4 +++-
 src/modelinfo/VehicleModelInfo.cpp | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/collision/ColModel.cpp b/src/collision/ColModel.cpp
index ccd679b2..2de7f736 100644
--- a/src/collision/ColModel.cpp
+++ b/src/collision/ColModel.cpp
@@ -7,6 +7,8 @@
 
 CColModel::CColModel(void)
 {
+	boundingSphere.Set(0.0001f, CVector(0.0f, 0.0f, 0.0f));
+	boundingBox.Set(CVector(0.0f, 0.0f, 0.0f), CVector(0.0f, 0.0f, 0.0f));
 	numSpheres = 0;
 	spheres = nil;
 	numLines = 0;
@@ -18,7 +20,7 @@ CColModel::CColModel(void)
 	triangles = nil;
 	trianglePlanes = nil;
 	level = LEVEL_GENERIC;	// generic col slot
-	ownsCollisionVolumes = true;
+//	ownsCollisionVolumes = true;
 }
 
 CColModel::~CColModel(void)
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index bc29d649..bd3a2154 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -275,6 +275,10 @@ RemoveWheelCB(RwObject *object, void *arg)
 void
 CVehicleModelInfo::RemoveWheels(void)
 {
+#ifdef FIX_BUGS
+	if(m_clump == nil)
+		return;
+#endif
 	RwObjectNameIdAssocation *desc = ms_vehicleDescs[m_vehicleType];
 	for(int i = 0; desc[i].name; i++){
 		RwObjectIdAssociation assoc;