From: bones_was_here <bones_was_here@xonotic.au>
Date: Sun, 28 Apr 2024 00:17:22 +0000 (+1000)
Subject: Recognise mods Quake 1.5 and Quake Combat+
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=65bfedf6d716879417b33b13629e27d88095079e;p=xonotic%2Fdarkplaces.git

Recognise mods Quake 1.5 and Quake Combat+

Their instructions both say "-game quake15" so they're currently
indistinguishable, but currently both require the same workarounds.

Closes https://github.com/DarkPlacesEngine/darkplaces/issues/164

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

diff --git a/cmd.c b/cmd.c
index b67179b5..4f9f3e48 100644
--- a/cmd.c
+++ b/cmd.c
@@ -746,6 +746,12 @@ static void Cmd_Exec(cmd_state_t *cmd, const char *filename)
 "csqc_polygons_defaultmaterial_nocullface 1\n"
 				);
 			break;
+		case GAME_QUAKE15:
+			Cbuf_InsertText(cmd, "\n"
+"sv_gameplayfix_impactbeforeonground 1\n"
+"sv_gameplayfix_unstickentities 1\n"
+			);
+			break;
 		default:
 			Cbuf_InsertText(cmd, "\n"
 "sv_gameplayfix_blowupfallenzombies 1\n"
diff --git a/com_game.c b/com_game.c
index b6a21564..74ca8552 100644
--- a/com_game.c
+++ b/com_game.c
@@ -86,6 +86,7 @@ static const gamemode_info_t gamemode_info [GAME_COUNT] =
 { GAME_VORETOURNAMENT,			GAME_VORETOURNAMENT,		"voretournament",		"-voretournament",			"Vore Tournament",			"Vore_Tournament",			"data",		NULL,			"voretournament",	"voretournament"		}, // COMMANDLINEOPTION: Game: -voretournament runs the multiplayer game Vore Tournament
 { GAME_DOOMBRINGER,				GAME_DOOMBRINGER,			"doombringer",			"-doombringer",				"DOOMBRINGER",				"DOOMBRINGER",				"dbdata",	NULL,			"doombringer",		"doombringer"			}, // COMMANDLINEOPTION: Game: -doombringer runs the game DOOMBRINGER
 { GAME_BATTLEMETAL,				GAME_NORMAL,				"battlemetal",			"-battlemetal",				"battlemetal",				"battlemetal",				"metaldata",	NULL,		"battlemetal",		"battlemetal"			}, // COMMANDLINEOPTION: Game: -battlemetal runs the game battleMETAL
+{ GAME_QUAKE15,					GAME_NORMAL,				"quake15",				"-quake15",					"Quake 1.5",				"Quake_1.5",				"id1",		"quake15",		"quake15",			"darkplaces"			}, // COMMANDLINEOPTION: Game: -quake15 runs the Quake 1.5 or Quake Combat+ mod
 };
 
 static void COM_SetGameType(int index);
diff --git a/com_game.h b/com_game.h
index aa2cdbe6..43bac1da 100644
--- a/com_game.h
+++ b/com_game.h
@@ -60,6 +60,7 @@ typedef enum gamemode_e
 	GAME_VORETOURNAMENT,
 	GAME_DOOMBRINGER, // added by Cloudwalk for kristus
 	GAME_BATTLEMETAL, // added by Cloudwalk for Subject9x
+	GAME_QUAKE15, // added by bones_was_here as it depends on an old bug and a workaround
 	GAME_COUNT
 }
 gamemode_t;