Load all base car models into memory (as permanent textures are already present)

+ Added MAX_CAR_RESIDENT_MODELS
+ use custom array for mission residentModels as new additional slot present

Author: SoapyMan

src_rebuild/Game/C/cars.c

@@ -79,20 +79,22 @@ DENTUVS *gTempCarUVPtr;
 DENTUVS gTempHDCarUVDump[MAX_CARS][MAX_DENTING_UVS];
 DENTUVS gTempLDCarUVDump[MAX_CARS][MAX_DENTING_LOD_UVS];
 
-CAR_MODEL NewCarModel[MAX_CAR_MODELS];
-CAR_MODEL NewLowCarModel[MAX_CAR_MODELS];
+CAR_MODEL NewCarModel[MAX_CAR_RESIDENT_MODELS];
+CAR_MODEL NewLowCarModel[MAX_CAR_RESIDENT_MODELS];
 
-MODEL* gCarLowModelPtr[MAX_CAR_MODELS];
-MODEL* gCarDamModelPtr[MAX_CAR_MODELS];
-MODEL* gCarCleanModelPtr[MAX_CAR_MODELS];
+MODEL* gCarLowModelPtr[MAX_CAR_RESIDENT_MODELS];
+MODEL* gCarDamModelPtr[MAX_CAR_RESIDENT_MODELS];
+MODEL* gCarCleanModelPtr[MAX_CAR_RESIDENT_MODELS];
 
 // pedestrian palette at 0 and next are cars
 // model_id, texture_number, palette
 u_short civ_clut[8][32][6];
 
+#define MAX_CAR_POLYS	(200 * 2) * MAX_CAR_RESIDENT_MODELS
+
 int whichCP = 0;
 int baseSpecCP = 0;
-CAR_POLY carPolyBuffer[2001];
+CAR_POLY carPolyBuffer[MAX_CAR_POLYS + 1];
 
 char LeftLight = 0;
 char RightLight = 0;
@@ -1065,7 +1067,7 @@ void buildNewCarFromModel(int index, int detail, char* polySrc, MODEL* model)
 
 		newNumPolys = whichCP;
 
-		for (i = 0; newNumPolys < 2000 && i < model->num_polys; i++)
+		for (i = 0; newNumPolys < MAX_CAR_POLYS && i < model->num_polys; i++)
 		{
 			ptype = *polyList;
 

src_rebuild/Game/C/cars.h

@@ -13,12 +13,12 @@ extern CAR_DATA car_data[MAX_CARS + 2];	// all cars + Tanner cbox + Camera cbox
 extern CAR_DATA* active_car_list[MAX_CARS];
 extern unsigned char lightsOnDelay[MAX_CARS];
 
-extern CAR_MODEL NewCarModel[MAX_CAR_MODELS];
-extern CAR_MODEL NewLowCarModel[MAX_CAR_MODELS];
+extern CAR_MODEL NewCarModel[MAX_CAR_RESIDENT_MODELS];
+extern CAR_MODEL NewLowCarModel[MAX_CAR_RESIDENT_MODELS];
 
-extern MODEL* gCarLowModelPtr[MAX_CAR_MODELS];
-extern MODEL* gCarDamModelPtr[MAX_CAR_MODELS];
-extern MODEL* gCarCleanModelPtr[MAX_CAR_MODELS];
+extern MODEL* gCarLowModelPtr[MAX_CAR_RESIDENT_MODELS];
+extern MODEL* gCarDamModelPtr[MAX_CAR_RESIDENT_MODELS];
+extern MODEL* gCarCleanModelPtr[MAX_CAR_RESIDENT_MODELS];
 
 extern int whichCP;		// car poly counter
 extern int baseSpecCP;	// special car poly counter

src_rebuild/Game/C/civ_ai.c

@@ -44,7 +44,7 @@ struct
 } civPingTest;
 #endif // DEBUG
 
-char modelRandomList[] = { 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 0, 1, 0, 4 };
+char modelRandomList[16] = { 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 0, 1, 0, 4 };
 u_char reservedSlots[MAX_CARS] = { 0 };
 
 int distFurthestCivCarSq = 0;
@@ -1595,7 +1595,7 @@ int PingOutAllSpecialCivCars(void)
 
 	do
 	{
-		if (lcp->controlType == CONTROL_TYPE_CIV_AI && MissionHeader->residentModels[lcp->ap.model] > 4)
+		if (lcp->controlType == CONTROL_TYPE_CIV_AI && missionResidentCarModels[lcp->ap.model] > 4)
 			PingOutCar(lcp);
 
 		lcp++;
@@ -1786,22 +1786,19 @@ int CreateStationaryCivCar(int direction, int orientX, int orientZ, LONGVECTOR4*
 	unsigned char* slot;
 	CAR_DATA* newCar;
 	CAR_DATA* carCnt;
-	int model;
+	int model, i;
 	EXTRA_CIV_DATA civDat;
 	LONGQUATERNION tmpQ;
 
 	model = -1;
-	
-	if (MissionHeader->residentModels[0] == externalModel)
-		model = 0;
-	else if (MissionHeader->residentModels[1] == externalModel)
-		model = 1;
-	else if (MissionHeader->residentModels[2] == externalModel)
-		model = 2;
-	else if (MissionHeader->residentModels[3] == externalModel)
-		model = 3;
-	else if (MissionHeader->residentModels[4] == externalModel)
-		model = 4;
+	for(i = 0; i < MAX_CAR_RESIDENT_MODELS; ++i)
+	{
+		if (missionResidentCarModels[i] == externalModel)
+		{
+			model = i;
+			break;
+		}
+	}
 
 	if (model != -1)
 	{
@@ -2172,18 +2169,27 @@ int PingInCivCar(int minPingInDist)
 	}
 
 	// check if special car is loaded and add it to random list
-	if (specModelValid == 0 || allowSpecSpooling == 0 || MissionHeader->residentModels[4] == 12)
+	if ((specModelValid == 0 || allowSpecSpooling == 0 || missionResidentCarModels[MAX_CAR_RESIDENT_MODELS-1] == 12) && missionResidentCarModels[MAX_CAR_RESIDENT_MODELS-1] >= 8)
 	{
+#if MAX_CAR_RESIDENT_MODELS == 6
+		modelRandomList[15] = 4;
+#else
 		modelRandomList[15] = 0;
+#endif
 		modelRandomList[14] = 1;
 	}
 	else
 	{
 		modelRandomList[15] = 4;
+
+#if MAX_CAR_RESIDENT_MODELS == 6
+		modelRandomList[14] = 4;
+#else
 		modelRandomList[14] = 1;
+#endif
 
 		if ((Random2(0) & 0x100) != 0)
-			modelRandomList[14] = 4;
+			modelRandomList[14] = MAX_CAR_RESIDENT_MODELS-1;
 	}
 
 	// another change for Caine's compound
@@ -2211,15 +2217,15 @@ int PingInCivCar(int minPingInDist)
 	}
 	else
 	{
-		model = modelRandomList[Random2(0) & 0xf];
+		model = modelRandomList[Random2(0) & 15];
 	}
 
 	// force spawn limo nearby in Caine's Cash
 	if (minPingInDist == 666)
 		model = 4;
 
 	// select car color palette
-	if (MissionHeader->residentModels[model] == 0 || MissionHeader->residentModels[model] > 4)
+	if (missionResidentCarModels[model] == 0 || missionResidentCarModels[model] > 4)
 	{
 		civDat.palette = 0;
 	}
@@ -2886,12 +2892,7 @@ void SetUpCivCollFlags(void)
 						hornchanflag[i] = GetFreeChannel();
 						SpuSetVoiceAR(hornchanflag[i], 27);
 
-						if (cp0->ap.model == 4)
-							sample = ResidentModelsBodge();
-						else if (cp0->ap.model < 3)
-							sample = cp0->ap.model;
-						else
-							sample = cp0->ap.model - 1;
+						sample = GetCarBankSample(cp0->ap.model);
 
 						// [A] use tracking sound
 						Start3DTrackingSound(hornchanflag[i], SOUND_BANK_CARS, sample * 3 + 2, 
@@ -3298,7 +3299,7 @@ void CreateRoadblock(void)
 	noMoreCars = 0;
 	distAlongSegment = -5;
 	lbody = car_cosmetics[3].colBox.vz;
-	externalCopModel = MissionHeader->residentModels[3];
+	externalCopModel = missionResidentCarModels[3];
 
 	// [A] use player instead of car
 	dir = player[0].dir;

src_rebuild/Game/C/cosmetic.c

@@ -17,7 +17,7 @@ char* CosmeticFiles[] = {
 	"LEVELS\\RIO.LCF",
 };
 
-CAR_COSMETICS car_cosmetics[MAX_CAR_MODELS];
+CAR_COSMETICS car_cosmetics[MAX_CAR_RESIDENT_MODELS];
 
 #if ENABLE_GAME_FIXES
 // [A] storage for spooled models
@@ -50,13 +50,13 @@ void ProcessCosmeticsLump(char *lump_ptr, int lump_size)
 	int i;
 	int offset;
 
-	for (i = 0; i < MAX_CAR_MODELS; i++)
+	for (i = 0; i < MAX_CAR_RESIDENT_MODELS; i++)
 	{
-		model = MissionHeader->residentModels[i];
+		model = missionResidentCarModels[i];
 
 		if (model == 13)
 		{
-			model = 10 - (MissionHeader->residentModels[0] + MissionHeader->residentModels[1] + MissionHeader->residentModels[2]);
+			model = 10 - (missionResidentCarModels[0] + missionResidentCarModels[1] + missionResidentCarModels[2]);
 
 			if (model < 1) 
 				model = 1;
@@ -79,7 +79,7 @@ void ProcessCosmeticsLump(char *lump_ptr, int lump_size)
 
 	// [A] cache all special vehicle cosmetics
 #if ENABLE_GAME_FIXES
-	for (i = 0; i < MAX_CAR_MODELS; i++)
+	for (i = 0; i < MAX_CAR_RESIDENT_MODELS; i++)
 	{
 		model = 8 + i;
 
@@ -137,22 +137,22 @@ void AddReverseLight(CAR_DATA *cp)
 void SetupSpecCosmetics(char *loadbuffer)
 {
 	int model;
-	model = MissionHeader->residentModels[4];
+	model = missionResidentCarModels[MAX_CAR_RESIDENT_MODELS - 1];
 
 #if ENABLE_GAME_FIXES
 	// [A] always use cached cosmetics
-	car_cosmetics[4] = levelSpecCosmetics[model - 8];
+	car_cosmetics[MAX_CAR_RESIDENT_MODELS - 1] = levelSpecCosmetics[model - 8];
 #else
-	car_cosmetics[4] = *(CAR_COSMETICS*)loadbuffer;
+	car_cosmetics[MAX_CAR_RESIDENT_MODELS - 1] = *(CAR_COSMETICS*)loadbuffer;
 #endif
 
 #if USE_PC_FILESYSTEM
 	if (gContentOverride)
-		LoadCustomCarCosmetics(&car_cosmetics[4], model);
+		LoadCustomCarCosmetics(&car_cosmetics[MAX_CAR_RESIDENT_MODELS - 1], model);
 #endif
 
 	// [A] don't forget
-	FixCarCos(&car_cosmetics[4], model);
+	FixCarCos(&car_cosmetics[MAX_CAR_RESIDENT_MODELS - 1], model);
 }
 
 // [D] [T]

src_rebuild/Game/C/cosmetic.h

@@ -1,7 +1,7 @@
 #ifndef COSMETIC_H
 #define COSMETIC_H
 
-extern CAR_COSMETICS car_cosmetics[MAX_CAR_MODELS];
+extern CAR_COSMETICS car_cosmetics[MAX_CAR_RESIDENT_MODELS];
 extern CAR_COSMETICS dummyCosmetics;
 
 extern int gcar_num;

src_rebuild/Game/C/cutscene.c

@@ -609,7 +609,7 @@ int TriggerInGameCutsceneSystem(int cutscene)
 							if (gCutsceneAtEnd != 0 && player[0].playerType == 1)
 							{
 								stream->SourceType.palette = car_data[player[0].playerCarId].ap.palette;
-								stream->SourceType.model = MissionHeader->residentModels[car_data[player[0].playerCarId].ap.model];
+								stream->SourceType.model = missionResidentCarModels[car_data[player[0].playerCarId].ap.model];
 
 								bDamageOverride = 1;
 								gCutsceneAtEnd = 0;

src_rebuild/Game/C/debris.c

@@ -4001,7 +4001,7 @@ int GetDebrisColour(CAR_DATA *cp)
 {
 	int car_model;
 
-	car_model = MissionHeader->residentModels[cp->ap.model];
+	car_model = missionResidentCarModels[cp->ap.model];
 
 	if (car_model == 0)
 		return 1;

src_rebuild/Game/C/denting.c

@@ -49,9 +49,9 @@ char* DentingFiles[] =
 #define MAX_FILE_DAMAGE_ZONE_POLYS	70
 #define MAX_FILE_DAMAGE_LEVELS		256
 
-u_char gCarDamageZoneVerts[MAX_CAR_MODELS][NUM_DAMAGE_ZONES][MAX_DAMAGE_ZONE_VERTS];
-u_char gHDCarDamageZonePolys[MAX_CAR_MODELS][NUM_DAMAGE_ZONES][MAX_DAMAGE_ZONE_POLYS];
-u_char gHDCarDamageLevels[MAX_CAR_MODELS][MAX_DAMAGE_LEVELS];	// the damage level (texture) count for polygons
+u_char gCarDamageZoneVerts[MAX_CAR_RESIDENT_MODELS][NUM_DAMAGE_ZONES][MAX_DAMAGE_ZONE_VERTS];
+u_char gHDCarDamageZonePolys[MAX_CAR_RESIDENT_MODELS][NUM_DAMAGE_ZONES][MAX_DAMAGE_ZONE_POLYS];
+u_char gHDCarDamageLevels[MAX_CAR_RESIDENT_MODELS][MAX_DAMAGE_LEVELS];	// the damage level (texture) count for polygons
 
 // [D] [T]
 void InitialiseDenting(void)
@@ -387,7 +387,7 @@ void MoveHubcap()
 
 		if (gTimeOfDay == TIME_NIGHT)
 		{
-			cmb = (combointensity & 0xffU) / 3;
+			cmb = (combointensity & 255) / 3;
 			combointensity = cmb << 0x10 | cmb << 8 | cmb;
 		}
 
@@ -408,13 +408,13 @@ void ProcessDentLump(char *lump_ptr, int lump_size)
 	int offset;
 	u_char* mem;
 
-	for (i = 0; i < MAX_CAR_MODELS; i++)
+	for (i = 0; i < MAX_CAR_RESIDENT_MODELS; i++)
 	{
-		model = MissionHeader->residentModels[i];
+		model = missionResidentCarModels[i];
 
 		if (model == 13)
 		{
-			model = 10 - (MissionHeader->residentModels[0] + MissionHeader->residentModels[1] + MissionHeader->residentModels[2]);
+			model = 10 - (missionResidentCarModels[0] + missionResidentCarModels[1] + missionResidentCarModels[2]);
 
 			if (model < 1) 
 				model = 1;
@@ -461,7 +461,7 @@ void SetupSpecDenting(char *loadbuffer)
 	{
 		char* newDenting;
 		int model;
-		model = MissionHeader->residentModels[4];
+		model = missionResidentCarModels[MAX_CAR_RESIDENT_MODELS - 1];
 
 		newDenting = LoadCustomCarDentingFromFile(NULL, model);
 		if (newDenting)
@@ -471,13 +471,13 @@ void SetupSpecDenting(char *loadbuffer)
 #endif
 
 	// [A] this is better
-	memcpy((u_char*)gCarDamageZoneVerts[4], (u_char*)loadbuffer, NUM_DAMAGE_ZONES * MAX_FILE_DAMAGE_ZONE_VERTS);
+	memcpy((u_char*)gCarDamageZoneVerts[MAX_CAR_RESIDENT_MODELS - 1], (u_char*)loadbuffer, NUM_DAMAGE_ZONES * MAX_FILE_DAMAGE_ZONE_VERTS);
 	offset = NUM_DAMAGE_ZONES * MAX_FILE_DAMAGE_ZONE_VERTS;
 
-	memcpy((u_char*)gHDCarDamageZonePolys[4], (u_char*)loadbuffer + offset, NUM_DAMAGE_ZONES * MAX_FILE_DAMAGE_ZONE_POLYS);
+	memcpy((u_char*)gHDCarDamageZonePolys[MAX_CAR_RESIDENT_MODELS - 1], (u_char*)loadbuffer + offset, NUM_DAMAGE_ZONES * MAX_FILE_DAMAGE_ZONE_POLYS);
 	offset += NUM_DAMAGE_ZONES * MAX_FILE_DAMAGE_ZONE_POLYS;
 
-	memcpy((u_char*)gHDCarDamageLevels[4], (u_char*)loadbuffer + offset, MAX_FILE_DAMAGE_LEVELS);
+	memcpy((u_char*)gHDCarDamageLevels[MAX_CAR_RESIDENT_MODELS - 1], (u_char*)loadbuffer + offset, MAX_FILE_DAMAGE_LEVELS);
 }
 
 // [D] [T]

src_rebuild/Game/C/event.c

@@ -1457,7 +1457,7 @@ void SetUpEvents(int full)
 			firstMissionEvent = &event[cEvents];
 			cEvents += 3;
 		}
-		else if (gCurrentMissionNumber - 39U < 2)
+		else if (gCurrentMissionNumber == 40)
 		{
 			// setup Lenny helicopter
 			evt[cEvents].flags = 0xC0;