From 1c498433ce5bdcfbd676631a6b0ae3df7d502e25 Mon Sep 17 00:00:00 2001 From: ttimo Date: Tue, 15 Nov 2022 09:56:26 -0600 Subject: [PATCH] BSP monitoring off by default for KexQ2 config --- radiant/gtkdlgs.cpp | 3 ++- radiant/preferences.cpp | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index 34fcb457..4f691ee4 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -385,6 +385,7 @@ game_t gameList[] = { { "unvanquished.game", "Unvanquished", "pkg", qtrue, qfalse }, { "unvanquished.game", "Unvanquished from source", "src", qfalse, qfalse }, + { "kexq2.game", "Quake II: Remaster", "baseq2", qtrue, qfalse }, }; GList *newMappingModesListForGameFile( Str & mGameFile ){ @@ -1310,7 +1311,7 @@ static void EnitityList_response( GtkDialog *dialog, gint response_id, gpointer } void DoEntityList(){ static GtkWidget *dialog; - GtkWidget *vbox, *hbox, *hbox2, *button, *scr, *content_area, *paned; + GtkWidget *vbox, *hbox2, *button, *scr, *content_area, *paned; GtkWidget *notebook, *label, *textview, *keyvalue_scr, *desc_scr; gint keyvalue_index; GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT; diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 754bbc65..47507495 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -3056,17 +3056,19 @@ void PrefsDlg::LoadPrefs(){ // this will probably need to be 75 or 100 for Q1. mLocalPrefs.GetPref( TEXTURESCALE_KEY, &m_nTextureScale, 50 ); - if ( ( g_pGameDescription->mGameFile == "hl.game" ) ) { + bool bWatchBSPDefault = TRUE; + bool bTextureWindowDefault = FALSE; + if ( g_pGameDescription->mGameFile == "hl.game" ) { // No BSP monitoring in the default compiler tools for Half-life (yet) - mLocalPrefs.GetPref( WATCHBSP_KEY, &m_bWatchBSP, FALSE ); - + bWatchBSPDefault = FALSE; // Texture subset on by default (HL specific really, because of halflife.wad's size) - mLocalPrefs.GetPref( TEXTURE_KEY, &m_bTextureWindow, TRUE ); - } else { - mLocalPrefs.GetPref( WATCHBSP_KEY, &m_bWatchBSP, TRUE ); - mLocalPrefs.GetPref( TEXTURE_KEY, &m_bTextureWindow, FALSE ); + bTextureWindowDefault = TRUE; + } else if ( g_pGameDescription->mGameFile == Q2_REMASTER_GAME ) { + // ericw-tools do not support BSP monitoring + bWatchBSPDefault = FALSE; } - + mLocalPrefs.GetPref( WATCHBSP_KEY, &m_bWatchBSP, bWatchBSPDefault ); + mLocalPrefs.GetPref( TEXTURE_KEY, &m_bTextureWindow, bTextureWindowDefault ); mLocalPrefs.GetPref( TEXTURESCROLLBAR_KEY, &m_bTextureScrollbar, TRUE ); mLocalPrefs.GetPref( DISPLAYLISTS_KEY, &m_bDisplayLists, TRUE );