Merge pull request #482 from tomkidd/vs2019

Upgrade to build and run from VS2019

code/qcommon/files.c

@@ -254,6 +254,7 @@ static  cvar_t          *fs_apppath;
 #endif
 static	cvar_t		*fs_steampath;
 static	cvar_t		*fs_gogpath;
+static	cvar_t		*fs_microsoftstorepath;
 
 static	cvar_t		*fs_basepath;
 static	cvar_t		*fs_basegame;
@@ -3353,6 +3354,10 @@ static void FS_Startup( const char *gameName )
 	}
 
 	// add search path elements in reverse priority order
+	fs_microsoftstorepath = Cvar_Get("fs_microsoftstorepath", Sys_MicrosoftStorePath(), CVAR_INIT | CVAR_PROTECTED);
+	if (fs_microsoftstorepath->string[0]) {
+		FS_AddGameDirectory(fs_microsoftstorepath->string, gameName);
+	}
 	fs_gogpath = Cvar_Get ("fs_gogpath", Sys_GogPath(), CVAR_INIT|CVAR_PROTECTED );
 	if (fs_gogpath->string[0]) {
 		FS_AddGameDirectory( fs_gogpath->string, gameName );

code/qcommon/q_shared.h

@@ -51,6 +51,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   #define STEAMPATH_NAME			"Quake 3 Arena"
   #define STEAMPATH_APPID			"2200"
   #define GOGPATH_ID				"1441704920"
+  #define MSSTORE_PATH				"Quake 3"
   #define GAMENAME_FOR_MASTER		"Quake3Arena"
   #define CINEMATICS_LOGO		"idlogo.RoQ"
   #define CINEMATICS_INTRO		"intro.RoQ"

code/qcommon/qcommon.h

@@ -1123,6 +1123,7 @@ void	Sys_SetDefaultInstallPath(const char *path);
 char	*Sys_DefaultInstallPath(void);
 char	*Sys_SteamPath(void);
 char	*Sys_GogPath(void);
+char	*Sys_MicrosoftStorePath(void);
 
 #ifdef __APPLE__
 char    *Sys_DefaultAppPath(void);

code/sys/sys_unix.c

@@ -50,6 +50,9 @@ static char steamPath[ MAX_OSPATH ] = { 0 };
 // Used to store the GOG Quake 3 installation path
 static char gogPath[ MAX_OSPATH ] = { 0 };
 
+// Used to store the Microsoft Store Quake 3 installation path
+static char microsoftStorePath[MAX_OSPATH] = { 0 };
+
 /*
 ==================
 Sys_DefaultHomePath
@@ -120,6 +123,18 @@ char *Sys_GogPath( void )
 	return gogPath;
 }
 
+/*
+================
+Sys_MicrosoftStorePath
+================
+*/
+char* Sys_MicrosoftStorePath(void)
+{
+	// Microsoft Store doesn't exist on Mac/Linux
+	return microsoftStorePath;
+}
+
+
 /*
 ================
 Sys_Milliseconds

code/sys/sys_win32.c

@@ -52,6 +52,9 @@ static char steamPath[ MAX_OSPATH ] = { 0 };
 // Used to store the GOG Quake 3 installation path
 static char gogPath[ MAX_OSPATH ] = { 0 };
 
+// Used to store the Microsoft Store Quake 3 installation path
+static char microsoftStorePath[MAX_OSPATH] = { 0 };
+
 #ifndef DEDICATED
 static UINT timerResolution = 0;
 #endif
@@ -222,6 +225,22 @@ char *Sys_GogPath( void )
 	return gogPath;
 }
 
+/*
+================
+Sys_MicrosoftStorePath
+================
+*/
+char* Sys_MicrosoftStorePath(void)
+{
+#ifdef MSSTORE_PATH
+	if (!microsoftStorePath[0]) 
+	{
+		Q_strcat(microsoftStorePath, MAX_OSPATH, "C:\\Program Files\\ModifiableWindowsApps\\Quake 3\\EN");
+	}
+#endif
+	return microsoftStorePath;
+}
+
 /*
 ================
 Sys_Milliseconds