Skip to content

tweak(gamelod): Disable changing display settings when clicking the Default button in Options Menu #1632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2025
Merged

tweak(gamelod): Disable changing display settings when clicking the Default button in Options Menu #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
770751a
tweak(gamelod): Disable changing display settings when clicking the D…
xezon Sep 24, 2025
2020f38
Replicate in Generals
xezon Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,8 @@ static OptionPreferences *pref = NULL;

static void setDefaults( void )
{
constexpr const Bool ModifyDisplaySettings = FALSE;

//-------------------------------------------------------------------------------------------------
// provider type
// GadgetCheckBoxSetChecked(checkAudioHardware, FALSE);
Expand All @@ -938,6 +940,8 @@ static void setDefaults( void )
// send Delay
GadgetCheckBoxSetChecked(checkSendDelay, FALSE);

if constexpr (ModifyDisplaySettings)
{
//-------------------------------------------------------------------------------------------------
// LOD
if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
Expand All @@ -961,7 +965,7 @@ static void setDefaults( void )
}
GadgetComboBoxSetSelectedPos( comboBoxResolution, defaultResIndex ); //should be 800x600 (our lowest supported mode)
}

}

//-------------------------------------------------------------------------------------------------
// Mouse Mode
Expand Down Expand Up @@ -996,12 +1000,13 @@ static void setDefaults( void )
GadgetSliderGetMinMax(sliderGamma,&valMin, &valMax);
GadgetSliderSetPosition(sliderGamma, ((valMax - valMin) / 2 + valMin));

//-------------------------------------------------------------------------------------------------
// Texture resolution slider
//

if constexpr (ModifyDisplaySettings)
{
if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
{
//-------------------------------------------------------------------------------------------------
// Texture resolution slider
//
Int txtFact=TheGameLODManager->getRecommendedTextureReduction();

GadgetSliderSetPosition( sliderTextureResolution, 2-txtFact);
Expand Down Expand Up @@ -1061,6 +1066,7 @@ static void setDefaults( void )
//
GadgetCheckBoxSetChecked( checkProps, TheGlobalData->m_useTrees);
}
}
}

static void saveOptions( void )
Expand Down
16 changes: 11 additions & 5 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,8 @@ static OptionPreferences *pref = NULL;

static void setDefaults( void )
{
constexpr const Bool ModifyDisplaySettings = FALSE;

//-------------------------------------------------------------------------------------------------
// provider type
// GadgetCheckBoxSetChecked(checkAudioHardware, FALSE);
Expand All @@ -982,6 +984,8 @@ static void setDefaults( void )
// send Delay
GadgetCheckBoxSetChecked(checkSendDelay, FALSE);

if constexpr (ModifyDisplaySettings)
{
//-------------------------------------------------------------------------------------------------
// LOD
if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
Expand All @@ -1005,7 +1009,7 @@ static void setDefaults( void )
}
GadgetComboBoxSetSelectedPos( comboBoxResolution, defaultResIndex ); //should be 800x600 (our lowest supported mode)
}

}

//-------------------------------------------------------------------------------------------------
// Mouse Mode
Expand Down Expand Up @@ -1042,12 +1046,13 @@ static void setDefaults( void )
GadgetSliderGetMinMax(sliderGamma,&valMin, &valMax);
GadgetSliderSetPosition(sliderGamma, ((valMax - valMin) / 2 + valMin));

//-------------------------------------------------------------------------------------------------
// Texture resolution slider
//

if constexpr (ModifyDisplaySettings)
{
if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
{
//-------------------------------------------------------------------------------------------------
// Texture resolution slider
//
Int txtFact=TheGameLODManager->getRecommendedTextureReduction();

GadgetSliderSetPosition( sliderTextureResolution, 2-txtFact);
Expand Down Expand Up @@ -1112,6 +1117,7 @@ static void setDefaults( void )
//
GadgetCheckBoxSetChecked( checkProps, TheGlobalData->m_useTrees);
}
}
}

static void saveOptions( void )
Expand Down
Loading