From 9471ed62f7a64412ddf9d09975f1728470adad64 Mon Sep 17 00:00:00 2001
From: Timothee 'TTimo' Besset <ttimo@ttimo.net>
Date: Fri, 11 Nov 2022 15:05:51 -0600
Subject: [PATCH] add a 'Quake II Remaster' game id

---
 radiant/preferences.cpp | 16 ++++++++++++++--
 radiant/preferences.h   |  3 +++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index c7eed0f1..754bbc65 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -3391,7 +3391,7 @@ void CGameInstall::OnGameSelectChanged( GtkWidget *widget, gpointer data ) {
 	GtkWidget *button = GTK_WIDGET( g_object_get_data( G_OBJECT( i->m_pWidget ), "executable_button" ) );
 
 	int game_id = i->m_availGames[ i->m_nComboSelect ];
-	if ( game_id == GAME_Q2 || game_id == GAME_QUETOO ) {
+	if ( game_id == GAME_Q2 || game_id == GAME_QUETOO || game_id == GAME_Q2_REMASTER ) {
 		gtk_widget_show( label );
 		gtk_widget_show( entry );
 		gtk_widget_show( button );
@@ -3439,6 +3439,9 @@ void CGameInstall::BuildDialog() {
 		case GAME_Q2:
 			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT( game_select_combo ), _( "Quake II" ) );
 			break;
+		case GAME_Q2_REMASTER:
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT( game_select_combo ), _( "Quake II Remaster" ) );
+			break;
 		case GAME_Q3:
 			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT( game_select_combo ), _( "Quake III Arena and mods" ) );
 			break;
@@ -3594,6 +3597,10 @@ void CGameInstall::Run() {
 		gamePack = Q2_PACK;
 		gameFilePath += Q2_GAME;
 		break;
+	case GAME_Q2_REMASTER:
+		gamePack = Q2_REMASTER_PACK;
+		gameFilePath += Q2_REMASTER_GAME;
+		break;
 	case GAME_Q3:
 		gamePack = Q3_PACK;
 		gameFilePath += Q3_GAME;
@@ -3693,7 +3700,9 @@ void CGameInstall::Run() {
 
 		break;
 	}
-	case GAME_Q2: {
+	case GAME_Q2:
+	case GAME_Q2_REMASTER:
+	{
 		fprintf( fg, "  idtech2=\"true\"\n" );
 		fprintf( fg, "  prefix=\".quake2\"\n" );
 		fprintf( fg, "  basegame=\"baseq2\"\n" );
@@ -3891,6 +3900,9 @@ void CGameInstall::ScanGames() {
 		if ( stricmp( dirname, Q2_PACK ) == 0 ) {
 			m_availGames[ iGame++ ] = GAME_Q2;
 		}
+		if ( stricmp( dirname, Q2_REMASTER_PACK ) == 0 ) {
+			m_availGames[ iGame++ ] = GAME_Q2_REMASTER;
+		}
 		if ( stricmp( dirname, TREMULOUS_PACK ) == 0 ) {
 			m_availGames[ iGame++ ] = GAME_TREMULOUS;
 		}
diff --git a/radiant/preferences.h b/radiant/preferences.h
index 3cd3a2d4..58aa9e86 100644
--- a/radiant/preferences.h
+++ b/radiant/preferences.h
@@ -209,6 +209,7 @@ void Dump();
 #define WARSOW_GAME "warsow.game"
 #define NEXUIZ_GAME "nexuiz.game"
 #define Q2_GAME "q2.game"
+#define Q2_REMASTER_GAME "kexq2.game"
 #define TREMULOUS_GAME "tremulous.game"
 #define JA_GAME "ja.game"
 #define REACTION_GAME "reaction.game"
@@ -226,6 +227,7 @@ void Dump();
 #define WARSOW_PACK "WarsowPack"
 #define NEXUIZ_PACK "NexuizPack"
 #define Q2_PACK "Q2Pack"
+#define Q2_REMASTER_PACK "KexQ2Pack"
 #define TREMULOUS_PACK "TremulousPack"
 #define JA_PACK "JAPack"
 #define REACTION_PACK "ReactionPack"
@@ -265,6 +267,7 @@ public:
 	GAME_WOLF,
 	GAME_Q1,
 	GAME_UNVANQUISHED,
+	GAME_Q2_REMASTER,
 	GAME_COUNT
   };