From: bones_was_here <bones_was_here@xonotic.au>
Date: Tue, 6 Feb 2024 09:31:45 +0000 (+1000)
Subject: fs: fix Quake expansions getting unloaded when adding a gamedir
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b7009740d891a5454c39106459ec9c63b74aa10;p=xonotic%2Fdarkplaces.git

fs: fix Quake expansions getting unloaded when adding a gamedir

It would switch back to Quake (from eg Rogue) even when the gamedir
being added didn't match any from a supported Quake expansion/mod.

Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
---

diff --git a/com_game.c b/com_game.c
index e2add7e2..0dcde1ea 100644
--- a/com_game.c
+++ b/com_game.c
@@ -118,11 +118,12 @@ void COM_InitGameType (void)
 
 void COM_ChangeGameTypeForGameDirs(void)
 {
-	int i;
+	unsigned i, gamemode_count = sizeof(gamemode_info) / sizeof(gamemode_info[0]);
 	int index = -1;
 	// this will not not change the gamegroup
+
 	// first check if a base game (single gamedir) matches
-	for (i = 0;i < (int)(sizeof (gamemode_info) / sizeof (gamemode_info[0]));i++)
+	for (i = 0; i < gamemode_count; i++)
 	{
 		if (gamemode_info[i].group == com_startupgamegroup && !(gamemode_info[i].gamedirname2 && gamemode_info[i].gamedirname2[0]))
 		{
@@ -130,10 +131,21 @@ void COM_ChangeGameTypeForGameDirs(void)
 			break;
 		}
 	}
-	// now that we have a base game, see if there is a matching derivative game (two gamedirs)
+	// now that we have a base game, see if there is a derivative game matching the startup one (two gamedirs)
+	// bones_was_here: this prevents a Quake expansion (eg Rogue) getting switched to Quake,
+	// and its gamedirname2 (eg "rogue") being lost from the search path, when adding a miscellaneous gamedir.
+	for (i = 0; i < gamemode_count; i++)
+	{
+		if (gamemode_info[i].group == com_startupgamegroup && (gamemode_info[i].gamedirname2 && gamemode_info[i].gamedirname2[0]) && gamemode_info[i].mode == com_startupgamemode)
+		{
+			index = i;
+			break;
+		}
+	}
+	// also see if the first gamedir (from -game parm or gamedir command) matches a derivative game (two/three gamedirs)
 	if (fs_numgamedirs)
 	{
-		for (i = 0;i < (int)(sizeof (gamemode_info) / sizeof (gamemode_info[0]));i++)
+		for (i = 0; i < gamemode_count; i++)
 		{
 			if (gamemode_info[i].group == com_startupgamegroup && (gamemode_info[i].gamedirname2 && gamemode_info[i].gamedirname2[0]) && !strcasecmp(fs_gamedirs[0], gamemode_info[i].gamedirname2))
 			{