Merge pull request #15 from OpenDriver2/develop-SoapyMan

Develop soapy man

Author: SoapyMan

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.2.{build}
+version: 5.0.{build}
 
 branches:
   only:

changelog.txt

@@ -1,8 +1,6 @@
-REDRIVER2 4.2 alpha
+## Changelog since Oct 12 2000 (1.0 release build)
 
-Changelog since Oct 12 2000
-
-Gameplay:
+### Gameplay:
 - Improved cop AI batter logic to better balance difficulty
 - Restored Tanner felony (can be seen in two Vegas missions)
 - Cops no longer can see player if on different heights
@@ -13,8 +11,10 @@ Gameplay:
 - Restored Tanner drowning movement in water
 - Fixed Tanner sitting on chairs
 - Easier jump in "Boat Jump"
+- Featured Driver Madness community chases by **Olanov, VortexStory, RacingFreak, Snoopi, Fireboyd78** and **SoapyMan**
 
-Effects/Visuals:
+### Effects/Visuals:
+- In-game cutscene subtitles
 - Improved draw distance and resolved glitches
 - Restored street lamp damage
 - Restored street light trails
@@ -25,13 +25,13 @@ Effects/Visuals:
 - Restored car engine smoke
 - Leaves are now affected properly by player car and chased car
 
-Film Director:
+### Film Director:
 - Fix camera invalidation bugs
 - Added variable zoom for non-locked tripod camera
 - Added target height adjustment to locked tripod camera
 - Improved chase camera, restored height and distance editing
 
-Other:
+### Other:
 - PC version now automatically saves undercover campaign progress
 - PC version now has command line arguments
 - Memory card overlay removed

data/config.ini

@@ -14,4 +14,5 @@ pgxpZbuffer=0
 drawDistance=1200
 freeCamera=1
 driver1music=0
+widescreenOverlays=0
 userChases=RacingFreak,Snoopi,Olanov,Vortex,Fireboyd78

src_rebuild/EMULATOR/EMULATOR.C

@@ -1387,6 +1387,24 @@ void Emulator_SetupClipMode(const RECT16& rect)
 #endif
 }
 
+void Emulator_GetPSXWidescreenMappedViewport(RECT16& rect)
+{
+	float emuScreenAspect = float(windowWidth) / float(windowHeight);
+
+	float psxScreenW = activeDispEnv.disp.w;
+	float psxScreenH = activeDispEnv.disp.h;
+
+	rect.x = activeDispEnv.screen.x;
+	rect.y = activeDispEnv.screen.y;
+
+	rect.w = psxScreenW * emuScreenAspect * PSX_SCREEN_ASPECT; // windowWidth;
+	rect.h = psxScreenH; // windowHeight;
+
+	rect.x -= (rect.w - activeDispEnv.disp.w) / 2;
+
+	rect.w += rect.x;
+}
+
 void Emulator_SetShader(const ShaderID &shader)
 {
 #if defined(OGL) || defined(OGLES)

src_rebuild/EMULATOR/EMULATOR.H

@@ -201,6 +201,8 @@ extern void Emulator_SetPolygonOffset(float ofs);
 extern void Emulator_SetStencilMode(int drawPrim);
 extern void Emulator_EnableDepth(int enable);
 
+extern void Emulator_GetPSXWidescreenMappedViewport(RECT16& rect);
+
 extern void Emulator_LineSwapSourceVerts(VERTTYPE* &p0, VERTTYPE* &p1, unsigned char* &c0, unsigned char* &c1);
 extern void Emulator_GenerateLineArray(struct Vertex* vertex, VERTTYPE* p0, VERTTYPE* p1, ushort gteidx);
 extern void Emulator_GenerateVertexArrayTriangle(struct Vertex* vertex, VERTTYPE* p0, VERTTYPE* p1, VERTTYPE* p2, ushort gteidx);

src_rebuild/GAME/C/BOMBERMAN.C

@@ -144,48 +144,48 @@ void HandleThrownBombs(void)
 	int dx, dz;
 	VECTOR velocity;
 
-	if (gBombTargetVehicle == NULL)
-		return;
-
-	ThrownBombDelay--;
-
-	if (ThrownBombDelay == -1)
+	// throw bombs if we have vehicle
+	if (gBombTargetVehicle)
 	{
-		ThrownBombDelay = Random2(0) % 45 + 8;
+		ThrownBombDelay--;
 
-		bomb = &ThrownBombs[CurrentBomb++];
-		CurrentBomb = CurrentBomb % MAX_THROWN_BOMBS;
+		if (ThrownBombDelay == -1)
+		{
+			ThrownBombDelay = Random2(0) % 45 + 8;
 
-		bomb->flags = 1;
-		bomb->active = 1;
+			bomb = &ThrownBombs[CurrentBomb++];
+			CurrentBomb = CurrentBomb % MAX_THROWN_BOMBS;
 
-		bomb->position.vx = gBombTargetVehicle->hd.where.t[0];
-		bomb->position.vy = gBombTargetVehicle->hd.where.t[1] - 200;
-		bomb->position.vz = gBombTargetVehicle->hd.where.t[2];
+			bomb->flags = 1;
+			bomb->active = 1;
 
-		velocity.vx = FIXEDH(gBombTargetVehicle->st.n.linearVelocity[0]);
-		velocity.vy = 0;
-		velocity.vz = FIXEDH(gBombTargetVehicle->st.n.linearVelocity[2]);
+			bomb->position.vx = gBombTargetVehicle->hd.where.t[0];
+			bomb->position.vy = gBombTargetVehicle->hd.where.t[1] - 200;
+			bomb->position.vz = gBombTargetVehicle->hd.where.t[2];
 
-		bomb->velocity.vx = velocity.vx >> 10;
-		bomb->velocity.vz = velocity.vz >> 10;
-		bomb->velocity.vy = -(Long2DDistance(&bomb->position, (VECTOR *)player[0].pos) >> 7);
+			velocity.vx = FIXEDH(gBombTargetVehicle->st.n.linearVelocity[0]);
+			velocity.vz = FIXEDH(gBombTargetVehicle->st.n.linearVelocity[2]);
 
-		if ((rand() & 1) == 0)
-			bomb->rot_speed = -bomb->velocity.vy;
-		else
-			bomb->rot_speed = bomb->velocity.vy;
+			bomb->velocity.vx = velocity.vx >> 10;
+			bomb->velocity.vz = velocity.vz >> 10;
+			bomb->velocity.vy = -(Long2DDistance(&bomb->position, (VECTOR *)player[0].pos) >> 7);
 
-		if (bomb->velocity.vy < -100)
-			bomb->velocity.vy = -100;
+			if ((rand() & 1) == 0)
+				bomb->rot_speed = -bomb->velocity.vy;
+			else
+				bomb->rot_speed = bomb->velocity.vy;
+
+			if (bomb->velocity.vy < -100)
+				bomb->velocity.vy = -100;
+		}
 	}
 
 	bomb = ThrownBombs;
 
 	i = 0;
 	while (i < MAX_THROWN_BOMBS)
 	{
-		if ((bomb->flags & 1) != 0) 
+		if (bomb->flags & 1) 
 		{
 			bomb->position.vx += bomb->velocity.vx;
 			bomb->position.vy += bomb->velocity.vy;
@@ -237,7 +237,7 @@ void HandleThrownBombs(void)
 		}
 		bomb++;
 		i++;
-	};
+	}
 }
 
 

src_rebuild/GAME/C/CAMERA.C

@@ -21,6 +21,7 @@
 #include "INLINE_C.H"
 #include "LIBGTE.H"
 #include "MAP.H"
+#include "PEDEST.H"
 
 
 VECTOR gCameraOffset = { 0};
@@ -1006,11 +1007,13 @@ void PlaceCameraInCar(PLAYER *lp, int BumperCam)
 	{
 		_RotMatrixY(&inv_camera_matrix, 0x800);
 		_RotMatrixY(&inv_camera_matrix, (lp->headPos >> 16));
-
+	
 		if (cp != NULL) 
 			viewer_position.vz = -170;
+		else
+			_RotMatrixX(&inv_camera_matrix, -tannerLookAngle.vx);
 	}
-
+	
 	MulMatrix0(&aspect, &inv_camera_matrix, &inv_camera_matrix);
 	InvertMatrix(&inv_camera_matrix, &camera_matrix);
 

src_rebuild/GAME/C/CARS.C

@@ -43,7 +43,9 @@ HUBCAP gHubcap;
 // active cars
 CAR_DATA* active_car_list[MAX_CARS];
 BOUND_BOX bbox[MAX_CARS];
-unsigned char lightsOnDelay[MAX_CARS];
+u_char lightsOnDelay[MAX_CARS];
+u_short civ_clut[8][32][6];
+
 
 // decompiled code
 // original method signature: 
@@ -2349,6 +2351,57 @@ char GetCarPalIndex(int tpage)
 }
 
 
+// [D]
+void ProcessPalletLump(char *lump_ptr, int lump_size)
+{
+	if (gDriver1Level)	// [A]
+		return;	// TODO: load Driver 1 civ palettes
+
+	ushort clutValue;
+	int *buffPtr;
+	int texnum;
+	int palette;
+	u_short *clutTablePtr;
+	u_short clutTable[320];
+	int tpageindex;
+	int total_cluts;
+	int clut_number;
+
+	if (*(int*)lump_ptr == 0 || *(int*)(lump_ptr + 4) == -1)
+		return;
+
+	buffPtr = (int*)(lump_ptr + 4);
+	clutTablePtr = (u_short*)clutTable;
+
+	do
+	{
+		palette = buffPtr[0];
+		texnum = buffPtr[1];
+		tpageindex = buffPtr[2];
+		total_cluts = buffPtr[3];
+
+		clut_number = GetCarPalIndex(tpageindex);
+
+		if (total_cluts == -1)
+		{
+			LoadImage(&clutpos, (u_long*)(buffPtr + 4));
+
+			clutValue = GetClut(clutpos.x, clutpos.y);
 
+			*clutTablePtr = clutValue;
+			clutTablePtr += 1;
 
+			IncrementClutNum(&clutpos);
+
+			buffPtr += 12;
+		}
+		else
+		{
+			clutValue = clutTable[total_cluts];
+			buffPtr += 4;
+		}
 
+		civ_clut[clut_number][texnum][palette + 1] = clutValue;
+	}
+	while (*buffPtr != -1);
+}

src_rebuild/GAME/C/CARS.H

@@ -38,6 +38,8 @@ extern short BackWheelRotation[MAX_CARS];
 extern char LeftLight;
 extern char RightLight;
 
+extern u_short civ_clut[8][32][6];
+
 extern void plotNewCarModel(CAR_MODEL *car, int palette); // 0x00020C94
 
 extern void plotCarPolyB3(int numTris, CAR_POLY *src, SVECTOR *vlist, plotCarGlobals *pg); // 0x000237B8

src_rebuild/GAME/C/CIV_AI.C

@@ -27,7 +27,7 @@
 #include "INLINE_C.H"
 #include "OVERLAY.H"
 
-unsigned char speedLimits[3] = { 56, 97, 138 };
+const u_char speedLimits[3] = { 56, 97, 138 };
 
 struct
 {
@@ -2767,6 +2767,17 @@ void InitCivCars(void)
 	roadblockDelay = roadblockDelayDiff[gCopDifficultyLevel] + (Random2(0) & 0xff);
 	PingOutCivsOnly = 0;
 	roadblockCount = roadblockDelay;
+
+	// [A] clear out other values
+	distFurthestCivCarSq = 0;
+	furthestCivID = 0;
+	makeLimoPullOver = 0;
+	limoId = 0;
+	playerNum = 0;
+	roadSeg = 0;
+	testNumPingedOut = 0;
+	currentAngle = 0;
+	closeEncounter = 3;
 }
 
 
@@ -3258,7 +3269,7 @@ int PingInCivCar(int minPingInDist)
 	int lbody;
 	int lane;
 	int i;
-	int oldCookieCount;
+	u_char cookieCountStart;
 	uint retDistSq;
 	unsigned char* slot;
 
@@ -3397,15 +3408,15 @@ int PingInCivCar(int minPingInDist)
 		if (requestCopCar == 0 && cookieCount > 43)
 			cookieCount -= 25;
 
-		oldCookieCount = cookieCount;
+		cookieCountStart = cookieCount;
 
 		do {
 			if (cookieCount < maxCookies)
 				cookieCount++;
 			else
 				cookieCount = 0;
 
-			if (cookieCount == oldCookieCount)
+			if (cookieCount == cookieCountStart)
 			{
 				break;
 			}