5 files changed, 124 insertions, 125 deletions

diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index d465fb5d..d04e8683 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -504,11 +504,11 @@ CCam::ProcessSpecialHeightRoutines(void)
 
 			switch(((CPhysical*)CamTargetEntity)->m_nSurfaceTouched)
 			case SURFACE_GRASS:
-			case SURFACE_DIRT:
-			case SURFACE_DIRTTRACK:
-			case SURFACE_STEEL:
-			case SURFACE_TIRE:
-			case SURFACE_STONE:
+			case SURFACE_GRAVEL:
+			case SURFACE_MUD_DRY:
+			case SURFACE_THICK_METAL_PLATE:
+			case SURFACE_RUBBER:
+			case SURFACE_STEEP_CLIFF:
 				OnRoad = true;
 
 			if(CCullZones::PlayerNoRain())
@@ -565,9 +565,9 @@ CCam::ProcessSpecialHeightRoutines(void)
 		if(PreviouslyFailedRoadHeightCheck && m_fCloseInPedHeightOffset < 0.0001f){
 			if(colPoint.surfaceB != SURFACE_TARMAC &&
 			   colPoint.surfaceB != SURFACE_GRASS &&
-			   colPoint.surfaceB != SURFACE_DIRT &&
-			   colPoint.surfaceB != SURFACE_DIRTTRACK &&
-			   colPoint.surfaceB != SURFACE_STONE){
+			   colPoint.surfaceB != SURFACE_GRAVEL &&
+			   colPoint.surfaceB != SURFACE_MUD_DRY &&
+			   colPoint.surfaceB != SURFACE_STEEP_CLIFF){
 				if(m_fRoadOffSet > 1.4f)
 					m_fRoadOffSet = 1.4f;
 			}else{
@@ -1408,11 +1408,11 @@ CCam::Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, fl
 			bool foo = false;
 			switch(((CPhysical*)CamTargetEntity)->m_nSurfaceTouched)
 			case SURFACE_GRASS:
-			case SURFACE_DIRT:
+			case SURFACE_GRAVEL:
 			case SURFACE_PAVEMENT:
-			case SURFACE_STEEL:
-			case SURFACE_TIRE:
-			case SURFACE_STONE:
+			case SURFACE_THICK_METAL_PLATE:
+			case SURFACE_RUBBER:
+			case SURFACE_STEEP_CLIFF:
 				foo = true;
 			if(foo)
 				WellBufferMe(TargetHeight, &m_fCamBufferedHeight, &m_fCamBufferedHeightSpeed, 0.4f, 0.05f, false);
@@ -1750,8 +1750,8 @@ CCam::WorkOutCamHeightWeeCar(CVector &TargetCoors, float TargetOrientation)
 	else
 		WellBufferMe(TargetZOffSet, &RoadHeightFix, &RoadHeightFixSpeed, 0.27f, 0.1f, false);
 
-	if((colpoint.surfaceB == SURFACE_DEFAULT || colpoint.surfaceB >= SURFACE_METAL6) &&
-	   colpoint.surfaceB != SURFACE_STEEL && colpoint.surfaceB != SURFACE_STONE &&
+	if((colpoint.surfaceB == SURFACE_DEFAULT || colpoint.surfaceB >= SURFACE_CAR) &&
+	   colpoint.surfaceB != SURFACE_THICK_METAL_PLATE && colpoint.surfaceB != SURFACE_STEEP_CLIFF &&
 	   RoadHeightFix > 1.4f)
 		RoadHeightFix = 1.4f;
 
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index d2e08f7c..b68214af 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -430,18 +430,18 @@ CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColMod
 		return false;
 
 	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			if(TestLineSphere(newline, model.spheres[i]))
 				return true;
 
 	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			if(TestLineBox(newline, model.boxes[i]))
 				return true;
 
 	CalculateTrianglePlanes(&model);
 	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			if(TestLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i]))
 				return true;
 
@@ -1062,16 +1062,16 @@ CCollision::ProcessLineOfSight(const CColLine &line,
 
 	float coldist = mindist;
 	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineSphere(newline, model.spheres[i], point, coldist);
 
 	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineBox(newline, model.boxes[i], point, coldist);
 
 	CalculateTrianglePlanes(&model);
 	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist);
 
 	if(coldist < mindist){
@@ -1103,17 +1103,17 @@ CCollision::ProcessVerticalLine(const CColLine &line,
 
 	float coldist = mindist;
 	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineSphere(newline, model.spheres[i], point, coldist);
 
 	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineBox(newline, model.boxes[i], point, coldist);
 
 	CalculateTrianglePlanes(&model);
 	TempStoredPoly.valid = false;
 	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessVerticalLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist, &TempStoredPoly);
 
 	if(coldist < mindist){
@@ -1642,15 +1642,15 @@ CCollision::DrawColModel_Coloured(const CMatrix &mat, const CColModel &colModel,
 			b *= f;
 		}
 
-		if(s == SURFACE_SCAFFOLD || s == SURFACE_METAL_FENCE ||
-		   s == SURFACE_BOLLARD || s == SURFACE_METAL_POLE)
+		if(s == SURFACE_TRANSPARENT_CLOTH || s == SURFACE_METAL_CHAIN_FENCE ||
+		   s == SURFACE_TRANSPARENT_STONE || s == SURFACE_SCAFFOLD_POLE)
 			if(CTimer::GetFrameCounter() & 1){
 				r = 0;
 				g = 0;
 				b = 0;
 			}
 
-		if(s > SURFACE_GATE){
+		if(s > SURFACE_METAL_GATE){
 			r = CGeneral::GetRandomNumber();
 			g = CGeneral::GetRandomNumber();
 			b = CGeneral::GetRandomNumber();
@@ -1723,8 +1723,8 @@ CCollision::DrawColModel_Coloured(const CMatrix &mat, const CColModel &colModel,
 			b *= f;
 		}
 
-		if(s == SURFACE_SCAFFOLD || s == SURFACE_METAL_FENCE ||
-		   s == SURFACE_BOLLARD || s == SURFACE_METAL_POLE)
+		if(s == SURFACE_TRANSPARENT_CLOTH || s == SURFACE_METAL_CHAIN_FENCE ||
+		   s == SURFACE_TRANSPARENT_STONE || s == SURFACE_SCAFFOLD_POLE)
 			if(CTimer::GetFrameCounter() & 1){
 				r = 0;
 				g = 0;
diff --git a/src/core/SurfaceTable.cpp b/src/core/SurfaceTable.cpp
index f002bf49..9076a9a6 100644
--- a/src/core/SurfaceTable.cpp
+++ b/src/core/SurfaceTable.cpp
@@ -59,38 +59,38 @@ CSurfaceTable::GetAdhesionGroup(uint8 surfaceType)
 	case SURFACE_DEFAULT:		return ADHESIVE_ROAD;
 	case SURFACE_TARMAC:		return ADHESIVE_ROAD;
 	case SURFACE_GRASS:		return ADHESIVE_LOOSE;
-	case SURFACE_DIRT:		return ADHESIVE_LOOSE;
-	case SURFACE_DIRTTRACK:		return ADHESIVE_HARD;
+	case SURFACE_GRAVEL:		return ADHESIVE_LOOSE;
+	case SURFACE_MUD_DRY:		return ADHESIVE_HARD;
 	case SURFACE_PAVEMENT:		return ADHESIVE_ROAD;
-	case SURFACE_METAL6:		return ADHESIVE_HARD;
+	case SURFACE_CAR:		return ADHESIVE_HARD;
 	case SURFACE_GLASS:		return ADHESIVE_HARD;
-	case SURFACE_SCAFFOLD:		return ADHESIVE_HARD;
-	case SURFACE_METAL_DOOR:	return ADHESIVE_HARD;
-	case SURFACE_BILLBOARD:		return ADHESIVE_HARD;
-	case SURFACE_STEEL:		return ADHESIVE_HARD;
-	case SURFACE_METAL_POLE:	return ADHESIVE_HARD;
-	case SURFACE_STREET_LIGHT:	return ADHESIVE_HARD;
-	case SURFACE_METAL14:		return ADHESIVE_HARD;
-	case SURFACE_METAL15:		return ADHESIVE_HARD;
-	case SURFACE_METAL_FENCE:	return ADHESIVE_HARD;
-	case SURFACE_FLESH:		return ADHESIVE_RUBBER;
+	case SURFACE_TRANSPARENT_CLOTH:	return ADHESIVE_HARD;
+	case SURFACE_GARAGE_DOOR:	return ADHESIVE_HARD;
+	case SURFACE_CAR_PANEL:		return ADHESIVE_HARD;
+	case SURFACE_THICK_METAL_PLATE:	return ADHESIVE_HARD;
+	case SURFACE_SCAFFOLD_POLE:	return ADHESIVE_HARD;
+	case SURFACE_LAMP_POST:		return ADHESIVE_HARD;
+	case SURFACE_FIRE_HYDRANT:	return ADHESIVE_HARD;
+	case SURFACE_GIRDER:		return ADHESIVE_HARD;
+	case SURFACE_METAL_CHAIN_FENCE:	return ADHESIVE_HARD;
+	case SURFACE_PED:		return ADHESIVE_RUBBER;
 	case SURFACE_SAND:		return ADHESIVE_SAND;
-	case SURFACE_PUDDLE:		return ADHESIVE_WET;
-	case SURFACE_WOOD:		return ADHESIVE_ROAD;
-	case SURFACE_WOOD_BOX:		return ADHESIVE_ROAD;
-	case SURFACE_WOOD_PLANK:	return ADHESIVE_ROAD;
-	case SURFACE_TIRE:		return ADHESIVE_RUBBER;
-	case SURFACE_HARD24:		return ADHESIVE_HARD;
+	case SURFACE_WATER:		return ADHESIVE_WET;
+	case SURFACE_WOOD_CRATES:	return ADHESIVE_ROAD;
+	case SURFACE_WOOD_BENCH:	return ADHESIVE_ROAD;
+	case SURFACE_WOOD_SOLID:	return ADHESIVE_ROAD;
+	case SURFACE_RUBBER:		return ADHESIVE_RUBBER;
+	case SURFACE_PLASTIC:		return ADHESIVE_HARD;
 	case SURFACE_HEDGE:		return ADHESIVE_LOOSE;
-	case SURFACE_STONE:		return ADHESIVE_LOOSE;
-	case SURFACE_METAL27:		return ADHESIVE_HARD;
-	case SURFACE_METAL28:		return ADHESIVE_HARD;
-	case SURFACE_RUBBER29:		return ADHESIVE_RUBBER;
-	case SURFACE_LOOSE30:		return ADHESIVE_LOOSE;
-	case SURFACE_BOLLARD:		return ADHESIVE_HARD;
-	case SURFACE_GATE:		return ADHESIVE_HARD;
-	case SURFACE_SAND33:		return ADHESIVE_SAND;
-	case SURFACE_ROAD34:		return ADHESIVE_ROAD;
+	case SURFACE_STEEP_CLIFF:	return ADHESIVE_LOOSE;
+	case SURFACE_CONTAINER:		return ADHESIVE_HARD;
+	case SURFACE_NEWS_VENDOR:	return ADHESIVE_HARD;
+	case SURFACE_WHEELBASE:		return ADHESIVE_RUBBER;
+	case SURFACE_CARDBOARDBOX:	return ADHESIVE_LOOSE;
+	case SURFACE_TRANSPARENT_STONE:	return ADHESIVE_HARD;
+	case SURFACE_METAL_GATE:	return ADHESIVE_HARD;
+	case SURFACE_SAND_BEACH:	return ADHESIVE_SAND;
+	case SURFACE_CONCRETE_BEACH:	return ADHESIVE_ROAD;
 	default:			return ADHESIVE_ROAD;
 	}
 }
@@ -101,41 +101,41 @@ CSurfaceTable::GetWetMultiplier(uint8 surfaceType)
 	switch(surfaceType){
 	case SURFACE_DEFAULT:
 	case SURFACE_TARMAC:
-	case SURFACE_DIRTTRACK:
+	case SURFACE_MUD_DRY:
 	case SURFACE_PAVEMENT:
-	case SURFACE_SCAFFOLD:
-	case SURFACE_WOOD:
-	case SURFACE_WOOD_BOX:
-	case SURFACE_WOOD_PLANK:
+	case SURFACE_TRANSPARENT_CLOTH:
+	case SURFACE_WOOD_CRATES:
+	case SURFACE_WOOD_BENCH:
+	case SURFACE_WOOD_SOLID:
 	case SURFACE_HEDGE:
-	case SURFACE_LOOSE30:
-	case SURFACE_BOLLARD:
-	case SURFACE_ROAD34:
+	case SURFACE_CARDBOARDBOX:
+	case SURFACE_TRANSPARENT_STONE:
+	case SURFACE_CONCRETE_BEACH:
 		return 1.0f - CWeather::WetRoads*0.25f;
 
 	case SURFACE_GRASS:
-	case SURFACE_METAL6:
+	case SURFACE_CAR:
 	case SURFACE_GLASS:
-	case SURFACE_METAL_DOOR:
-	case SURFACE_BILLBOARD:
-	case SURFACE_STEEL:
-	case SURFACE_METAL_POLE:
-	case SURFACE_STREET_LIGHT:
-	case SURFACE_METAL14:
-	case SURFACE_METAL15:
-	case SURFACE_METAL_FENCE:
-	case SURFACE_FLESH:
-	case SURFACE_TIRE:
-	case SURFACE_HARD24:
-	case SURFACE_STONE:
-	case SURFACE_METAL27:
-	case SURFACE_METAL28:
-	case SURFACE_RUBBER29:
-	case SURFACE_GATE:
+	case SURFACE_GARAGE_DOOR:
+	case SURFACE_CAR_PANEL:
+	case SURFACE_THICK_METAL_PLATE:
+	case SURFACE_SCAFFOLD_POLE:
+	case SURFACE_LAMP_POST:
+	case SURFACE_FIRE_HYDRANT:
+	case SURFACE_GIRDER:
+	case SURFACE_METAL_CHAIN_FENCE:
+	case SURFACE_PED:
+	case SURFACE_RUBBER:
+	case SURFACE_PLASTIC:
+	case SURFACE_STEEP_CLIFF:
+	case SURFACE_CONTAINER:
+	case SURFACE_NEWS_VENDOR:
+	case SURFACE_WHEELBASE:
+	case SURFACE_METAL_GATE:
 		return 1.0f - CWeather::WetRoads*0.4f;
 
 	case SURFACE_SAND:
-	case SURFACE_SAND33:
+	case SURFACE_SAND_BEACH:
 		return 1.0f - CWeather::WetRoads*0.5f;
 
 	default:
diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h
index 5d8d2c4f..d8f9be3d 100644
--- a/src/core/SurfaceTable.h
+++ b/src/core/SurfaceTable.h
@@ -1,43 +1,42 @@
 #pragma once
 
-// TODO: check this
 enum eSurfaceType
 {
 	SURFACE_DEFAULT,
 	SURFACE_TARMAC,
 	SURFACE_GRASS,
-	SURFACE_DIRT,
-	SURFACE_DIRTTRACK,
+	SURFACE_GRAVEL,
+	SURFACE_MUD_DRY,
 	SURFACE_PAVEMENT,
-	SURFACE_METAL6,
+	SURFACE_CAR,
 	SURFACE_GLASS,
-	SURFACE_SCAFFOLD,
-	SURFACE_METAL_DOOR,	// garage door
-	SURFACE_BILLBOARD,
-	SURFACE_STEEL,		//?
-	SURFACE_METAL_POLE,	// ?
-	SURFACE_STREET_LIGHT,
-	SURFACE_METAL14,
-	SURFACE_METAL15,
-	SURFACE_METAL_FENCE,
-	SURFACE_FLESH,
+	SURFACE_TRANSPARENT_CLOTH,
+	SURFACE_GARAGE_DOOR,
+	SURFACE_CAR_PANEL,
+	SURFACE_THICK_METAL_PLATE,
+	SURFACE_SCAFFOLD_POLE,
+	SURFACE_LAMP_POST,
+	SURFACE_FIRE_HYDRANT,
+	SURFACE_GIRDER,
+	SURFACE_METAL_CHAIN_FENCE,
+	SURFACE_PED,
 	SURFACE_SAND,
-	SURFACE_PUDDLE,
-	SURFACE_WOOD,
-	SURFACE_WOOD_BOX,
-	SURFACE_WOOD_PLANK,
-	SURFACE_TIRE,
-	SURFACE_HARD24,
+	SURFACE_WATER,
+	SURFACE_WOOD_CRATES,
+	SURFACE_WOOD_BENCH,
+	SURFACE_WOOD_SOLID,
+	SURFACE_RUBBER,
+	SURFACE_PLASTIC,
 	SURFACE_HEDGE,
-	SURFACE_STONE,
-	SURFACE_METAL27,
-	SURFACE_METAL28,
-	SURFACE_RUBBER29,
-	SURFACE_LOOSE30,
-	SURFACE_BOLLARD,
-	SURFACE_GATE,
-	SURFACE_SAND33,
-	SURFACE_ROAD34,
+	SURFACE_STEEP_CLIFF,
+	SURFACE_CONTAINER,
+	SURFACE_NEWS_VENDOR,
+	SURFACE_WHEELBASE,
+	SURFACE_CARDBOARDBOX,
+	SURFACE_TRANSPARENT_STONE,
+	SURFACE_METAL_GATE,
+	SURFACE_SAND_BEACH,
+	SURFACE_CONCRETE_BEACH,
 };
 
 enum
diff --git a/src/core/TempColModels.cpp b/src/core/TempColModels.cpp
index f20923f2..a4814759 100644
--- a/src/core/TempColModels.cpp
+++ b/src/core/TempColModels.cpp
@@ -66,7 +66,7 @@ CTempColModels::Initialise(void)
 #else
 	for (i = 0; i < ARRAY_SIZE(s_aPedGSpheres); i++) {
 #endif
-		s_aPedSpheres[i].surface = SURFACE_FLESH;
+		s_aPedSpheres[i].surface = SURFACE_PED;
 		s_aPedSpheres[i].piece = 0;
 	}
 
@@ -85,7 +85,7 @@ CTempColModels::Initialise(void)
 	s_aPed2Spheres[2].center = CVector(0.0f, -0.35f, -0.9f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aPed2Spheres); i++) {
-		s_aPed2Spheres[i].surface = SURFACE_FLESH;
+		s_aPed2Spheres[i].surface = SURFACE_PED;
 		s_aPed2Spheres[i].piece = 0;
 	}
 
@@ -106,10 +106,10 @@ CTempColModels::Initialise(void)
 	s_aPedGSpheres[2].center = CVector(0.0f, 0.25f, -0.9f);
 	s_aPedGSpheres[3].center = CVector(0.0f, 0.65f, -0.9f);
 
-	s_aPedGSpheres[0].surface = SURFACE_FLESH;
-	s_aPedGSpheres[1].surface = SURFACE_FLESH;
-	s_aPedGSpheres[2].surface = SURFACE_FLESH;
-	s_aPedGSpheres[3].surface = SURFACE_FLESH;
+	s_aPedGSpheres[0].surface = SURFACE_PED;
+	s_aPedGSpheres[1].surface = SURFACE_PED;
+	s_aPedGSpheres[2].surface = SURFACE_PED;
+	s_aPedGSpheres[3].surface = SURFACE_PED;
 	s_aPedGSpheres[0].piece = 4;
 	s_aPedGSpheres[1].piece = 1;
 	s_aPedGSpheres[2].piece = 0;
@@ -131,7 +131,7 @@ CTempColModels::Initialise(void)
 	s_aDoorSpheres[2].center = CVector(0.0f, -0.6f, 0.25f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aDoorSpheres); i++) {
-		s_aDoorSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aDoorSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aDoorSpheres[i].piece = 0;
 	}
 
@@ -151,7 +151,7 @@ CTempColModels::Initialise(void)
 	s_aBumperSpheres[3].center = CVector(-0.85f, -0.05f, 0.0f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aBumperSpheres); i++) {
-		s_aBumperSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aBumperSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aBumperSpheres[i].piece = 0;
 	}
 
@@ -171,7 +171,7 @@ CTempColModels::Initialise(void)
 	s_aPanelSpheres[3].center = CVector(-0.15f, 0.45f, 0.0f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aPanelSpheres); i++) {
-		s_aPanelSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aPanelSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aPanelSpheres[i].piece = 0;
 	}
 
@@ -191,7 +191,7 @@ CTempColModels::Initialise(void)
 	s_aBonnetSpheres[3].center = CVector(0.4f, 0.9f, 0.0f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aBonnetSpheres); i++) {
-		s_aBonnetSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aBonnetSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aBonnetSpheres[i].piece = 0;
 	}
 
@@ -211,7 +211,7 @@ CTempColModels::Initialise(void)
 	s_aBootSpheres[3].center = CVector(0.4f, -0.6f, 0.0f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aBootSpheres); i++) {
-		s_aBootSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aBootSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aBootSpheres[i].piece = 0;
 	}
 
@@ -233,7 +233,7 @@ CTempColModels::Initialise(void)
 #else
 	for (i = 0; i < ARRAY_SIZE(s_aBootSpheres); i++) {
 #endif
-		s_aWheelSpheres[i].surface = SURFACE_RUBBER29;
+		s_aWheelSpheres[i].surface = SURFACE_WHEELBASE;
 		s_aWheelSpheres[i].piece = 0;
 	}
 
@@ -255,7 +255,7 @@ CTempColModels::Initialise(void)
 #else
 	for (i = 0; i < ARRAY_SIZE(s_aBootSpheres); i++) {
 #endif
-		s_aBodyPartSpheres1[i].surface = SURFACE_FLESH;
+		s_aBodyPartSpheres1[i].surface = SURFACE_PED;
 		s_aBodyPartSpheres1[i].piece = 0;
 	}
 
@@ -277,7 +277,7 @@ CTempColModels::Initialise(void)
 #else
 	for (i = 0; i < ARRAY_SIZE(s_aBootSpheres); i++) {
 #endif
-		s_aBodyPartSpheres2[i].surface = SURFACE_FLESH;
+		s_aBodyPartSpheres2[i].surface = SURFACE_PED;
 		s_aBodyPartSpheres2[i].piece = 0;
 	}