- fix compilation with Emscripten, make it more effortless; fix crashes

Author: SoapyMan

.gitignore

@@ -25,6 +25,8 @@
 *.code-workspace
 .vscode/*
 .vs/*
+game/*
+webdemo/*
 PSXToolchain/GameSRC*
 PSXToolchain/Overlay*
 PSXToolchain/PsyQ/*

src_rebuild/Game/C/civ_ai.c

@@ -2224,6 +2224,14 @@ int PingInCivCar(int minPingInDist)
 	if (minPingInDist == 666)
 		model = MAX_CAR_RESIDENT_MODELS - 1;
 
+#if MAX_CAR_RESIDENT_MODELS == 6
+	// [A] fix crashes on missing models
+	if(!gCarCleanModelPtr[model])
+	{
+		return 0;
+	}
+#endif
+
 	// select car color palette
 	if (residentCarModels[model] == 0 || residentCarModels[model] > 4)
 	{

src_rebuild/Game/C/event.c

@@ -2170,7 +2170,7 @@ void StepPathEvent(EVENT* ev)
 		{
 			// [A] preserve direction flag or train will get stuck
 			// i might have been decompiled it wrong but now it works
-			// also preserve collision if it has one (for vegas trains)
+			// also preserve collision flag
 			dir = ev->flags & 0x600;
 
 			InitTrain(ev, 0, GameLevel == 0 ? 0 : 1);

src_rebuild/Game/C/felony.h

@@ -14,8 +14,6 @@ extern FELONY_DATA felonyData;
 extern void InitFelonySystem(); // 0x0004D280
 extern void CheckPlayerMiscFelonies(); // 0x0004CC28
 
-extern int GetHeading(int direction); // 0x0004D420
-
 extern char GetCarDirectionOfTravel(CAR_DATA* cp); // 0x0004D430
 extern char GetPlayerDirectionOfTravel(PLAYER* pl);
 

src_rebuild/Game/Frontend/FEmain.c

@@ -703,6 +703,7 @@ PSXSCREEN* pScreenStack[10] = { 0 };
 PSXBUTTON* pButtonStack[10] = { 0 };
 
 POLY_FT4 BackgroundPolys[6];
+POLY_F4 BackgroundBlack;
 FE_FONT feFont;
 
 RECT16 extraRect = { 896, 256, 64, 219 };
@@ -844,6 +845,7 @@ void SetVariable(int var)
 void SetupBackgroundPolys(void)
 {
 	POLY_FT4 *poly;
+	POLY_F4* bg;
 	int i;
 
 	for (i = 0; i < 6; i++)
@@ -889,6 +891,11 @@ void SetupBackgroundPolys(void)
 	setUVWH(poly, 0, 0, 128, 255);
 	setClut(poly, 960, 256);
 	setTPage(poly, 0, 0, 960, 0);
+
+	bg = &BackgroundBlack;
+	setPolyF4(bg);
+	setXYWH(bg, -1000, 0, 2000, 512);
+	setRGB0(bg, 0, 0, 0);
 }
 
 SPRT HighlightSprt;
@@ -1054,7 +1061,8 @@ void DrawScreen(PSXSCREEN *pScr)
 
 	for (i = 0; i < 6; i++)
 		addPrim(current->ot + 11, &BackgroundPolys[i]);
-
+	addPrim(current->ot + 11, &BackgroundBlack);
+	
 	if (pScr)
 	{
 		GetTimeStamp(version_info);

src_rebuild/Game/driver2.h

@@ -26,8 +26,13 @@
 
 #include "platform.h"
 
-#define USE_PC_FILESYSTEM			(!defined(PSX))		// PC filesystem is prioritized over CD
-#define USE_CD_FILESYSTEM			1					// use always
+#ifdef PSX
+#define USE_PC_FILESYSTEM			0
+#else
+#define USE_PC_FILESYSTEM			1   // PC filesystem is prioritized over CD
+#endif
+
+#define USE_CD_FILESYSTEM			1	// use always
 #define ENABLE_MISSION_FIXES		1
 #define ENABLE_GAME_FIXES			1
 #define ENABLE_GAME_ENCHANCEMENTS	1

src_rebuild/PsyCross

@@ -0,0 +1,2 @@
+#!/bin/bash
+./premake5 gmake2 --os=emscripten

src_rebuild/gen_emcc.bat

@@ -13,6 +13,6 @@ extern "C" {
 
 	void EMSCRIPTEN_KEEPALIVE WebLoadCDImage(char* data, int size) 
 	{
-		PsyX_CDFS_Init_Mem((u_long*)data, size, 0, 0);
+		PsyX_CDFS_Init_Mem((u_int*)data, size, 0, 0);
 	}
 }