- one-shot model override loading for spooled cars

Author: SoapyMan

src_rebuild/Game/C/bcollide.c

@@ -46,8 +46,8 @@ int bcollided2d(CDATA2D *body, int* boxOverlap)
 	}
 
 	// hmmm, why?
-	as = RSIN(dtheta & 0x7ff);			// rcossin_tbl[(dtheta & 0x7ff) * 2];
-	ac = RSIN(dtheta + 1024 & 0x7ff);	// rcossin_tbl[(dtheta + 1024 & 0x7ff) * 2];
+	as = RSIN(dtheta & 2047);			// rcossin_tbl[(dtheta & 0x7ff) * 2];
+	ac = RSIN(dtheta + 1024 & 2047);	// rcossin_tbl[(dtheta + 1024 & 0x7ff) * 2];
 
 	delta.vx = body[0].x.vx - body[1].x.vx;
 	delta.vz = body[0].x.vz - body[1].x.vz;

src_rebuild/Game/C/gamesnd.c

@@ -206,15 +206,17 @@ int ResidentModelsBodge(void)
 	int i;
 	int j;
 
-	j = MissionHeader->residentModels[4];
-
-	if (gCurrentMissionNumber == 24 || gCurrentMissionNumber == 27 ||
+	if (gCurrentMissionNumber == 24 || 
+		gCurrentMissionNumber == 27 ||
 		gCurrentMissionNumber == 29 ||
-		(gCurrentMissionNumber == 30 || gCurrentMissionNumber == 35))
+		gCurrentMissionNumber == 30 ||
+		gCurrentMissionNumber == 35)
 	{
 		return 3;
 	}
 
+	j = MissionHeader->residentModels[4];
+
 	if (gCurrentMissionNumber - 50U < 16 && j == 12)
 	{
 		return 5;
@@ -224,7 +226,7 @@ int ResidentModelsBodge(void)
 	{
 		i = 11;
 
-		if (j != 9)
+		if (j != 9 && j != i)
 			return 3;
 	}
 	else if (GameLevel == 1) 

src_rebuild/Game/C/models.c

@@ -5,6 +5,10 @@
 #include "mission.h"
 #include "cars.h"
 
+#if USE_PC_FILESYSTEM
+extern int gContentOverride;
+#endif
+
 MODEL dummyModel = { 0 };
 
 char* modelname_buffer = NULL;
@@ -243,14 +247,13 @@ int ProcessCarModelLump(char *lump_ptr, int lump_size)
 			int lowOfs = offsets[2];
 
 #if USE_PC_FILESYSTEM
-			extern int gContentOverride;
 			if (gContentOverride)
 			{
 				char* mem;
 				if (mem = LoadCarModelFromFile(NULL, model_number, CAR_MODEL_CLEAN))
 				{
 					D_MALLOC_BEGIN();
-					model = GetCarModel(mem, (char**)&mallocptr, 1, model_number, CAR_MODEL_CLEAN);
+					model = GetCarModel(mem, (char**)&mallocptr, 1);
 					D_MALLOC_END();
 
 					gCarCleanModelPtr[i] = model;
@@ -260,7 +263,7 @@ int ProcessCarModelLump(char *lump_ptr, int lump_size)
 				if (mem = LoadCarModelFromFile(NULL, model_number, CAR_MODEL_DAMAGED))
 				{
 					D_MALLOC_BEGIN();
-					model = GetCarModel(mem, (char**)&mallocptr, 1, model_number, CAR_MODEL_DAMAGED);
+					model = GetCarModel(mem, (char**)&mallocptr, 1);
 					D_MALLOC_END();
 
 					gCarDamModelPtr[i] = model;
@@ -270,7 +273,7 @@ int ProcessCarModelLump(char *lump_ptr, int lump_size)
 				if (mem = LoadCarModelFromFile(NULL, model_number, CAR_MODEL_LOWDETAIL))
 				{
 					D_MALLOC_BEGIN();
-					model = GetCarModel(mem, (char**)&mallocptr, 1, model_number, CAR_MODEL_LOWDETAIL);
+					model = GetCarModel(mem, (char**)&mallocptr, 1);
 					D_MALLOC_END();
 
 					gCarLowModelPtr[i] = model;
@@ -282,30 +285,39 @@ int ProcessCarModelLump(char *lump_ptr, int lump_size)
 			if (cleanOfs != -1)
 			{
 				D_MALLOC_BEGIN();
-				model = GetCarModel(models_offset + cleanOfs, (char**)&mallocptr, 1, model_number, CAR_MODEL_CLEAN);
+				model = GetCarModel(models_offset + cleanOfs, (char**)&mallocptr, 1);
 				gCarCleanModelPtr[i] = model;
 				D_MALLOC_END();
 			}
 
 			if (damOfs != -1)
 			{
 				D_MALLOC_BEGIN();
-				model = GetCarModel(models_offset + damOfs, (char**)&mallocptr, 0, model_number, CAR_MODEL_DAMAGED);
+				model = GetCarModel(models_offset + damOfs, (char**)&mallocptr, 0);
 				gCarDamModelPtr[i] = model;
 				D_MALLOC_END();
 			}
 
 			if (lowOfs != -1)
 			{
 				D_MALLOC_BEGIN();
-				model = GetCarModel(models_offset + lowOfs, (char**)&mallocptr, 1, model_number, CAR_MODEL_LOWDETAIL);
+				model = GetCarModel(models_offset + lowOfs, (char**)&mallocptr, 1);
 				gCarLowModelPtr[i] = model;
 				D_MALLOC_END();
 			}
 		}
 	}
 
 	D_MALLOC_BEGIN();
+
+#if USE_PC_FILESYSTEM
+	if (gContentOverride)
+	{
+		// extra spool memory needed
+		specMemReq += 4096;
+	}
+#endif
+
 	mallocptr = specmallocptr + specMemReq;
 	specLoadBuffer = specmallocptr + specMemReq - 2048;
 	D_MALLOC_END();
@@ -344,7 +356,7 @@ char* LoadCarModelFromFile(char* dest, int modelNumber, int type)
 #endif
 
 // [D] [T]
-MODEL* GetCarModel(char *src, char **dest, int KeepNormals, int modelNumber, int type)
+MODEL* GetCarModel(char *src, char **dest, int KeepNormals)
 {
 	int size;
 	MODEL *model;

src_rebuild/Game/C/models.h

@@ -29,7 +29,7 @@ extern void ProcessMDSLump(char *lump_file, int lump_size); // 0x00064CFC
 
 extern int ProcessCarModelLump(char *lump_ptr, int lump_size); // 0x00064E6C
 
-extern MODEL * GetCarModel(char *src, char **dest, int KeepNormals, int modelNumber, int type); // 0x00065134
+extern MODEL * GetCarModel(char *src, char **dest, int KeepNormals); // 0x00065134
 
 extern MODEL * FindModelPtrWithName(char *name); // 0x0005D40C