Skip to content

Commit 403696c

Browse files
authored
tweak(gamelod): Disable changing display settings when clicking the Default button in Options Menu (#1632)
1 parent ebe28dc commit 403696c

File tree

2 files changed

+22
-10
lines changed
  • GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus
  • Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus

2 files changed

+22
-10
lines changed

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -922,6 +922,8 @@ static OptionPreferences *pref = NULL;
922922

923923
static void setDefaults( void )
924924
{
925+
constexpr const Bool ModifyDisplaySettings = FALSE;
926+
925927
//-------------------------------------------------------------------------------------------------
926928
// provider type
927929
// GadgetCheckBoxSetChecked(checkAudioHardware, FALSE);
@@ -938,6 +940,8 @@ static void setDefaults( void )
938940
// send Delay
939941
GadgetCheckBoxSetChecked(checkSendDelay, FALSE);
940942

943+
if constexpr (ModifyDisplaySettings)
944+
{
941945
//-------------------------------------------------------------------------------------------------
942946
// LOD
943947
if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
@@ -961,7 +965,7 @@ static void setDefaults( void )
961965
}
962966
GadgetComboBoxSetSelectedPos( comboBoxResolution, defaultResIndex ); //should be 800x600 (our lowest supported mode)
963967
}
964-
968+
}
965969

966970
//-------------------------------------------------------------------------------------------------
967971
// Mouse Mode
@@ -996,12 +1000,13 @@ static void setDefaults( void )
9961000
GadgetSliderGetMinMax(sliderGamma,&valMin, &valMax);
9971001
GadgetSliderSetPosition(sliderGamma, ((valMax - valMin) / 2 + valMin));
9981002

999-
//-------------------------------------------------------------------------------------------------
1000-
// Texture resolution slider
1001-
//
1002-
1003+
if constexpr (ModifyDisplaySettings)
1004+
{
10031005
if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
10041006
{
1007+
//-------------------------------------------------------------------------------------------------
1008+
// Texture resolution slider
1009+
//
10051010
Int txtFact=TheGameLODManager->getRecommendedTextureReduction();
10061011

10071012
GadgetSliderSetPosition( sliderTextureResolution, 2-txtFact);
@@ -1061,6 +1066,7 @@ static void setDefaults( void )
10611066
//
10621067
GadgetCheckBoxSetChecked( checkProps, TheGlobalData->m_useTrees);
10631068
}
1069+
}
10641070
}
10651071

10661072
static void saveOptions( void )

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,8 @@ static OptionPreferences *pref = NULL;
966966

967967
static void setDefaults( void )
968968
{
969+
constexpr const Bool ModifyDisplaySettings = FALSE;
970+
969971
//-------------------------------------------------------------------------------------------------
970972
// provider type
971973
// GadgetCheckBoxSetChecked(checkAudioHardware, FALSE);
@@ -982,6 +984,8 @@ static void setDefaults( void )
982984
// send Delay
983985
GadgetCheckBoxSetChecked(checkSendDelay, FALSE);
984986

987+
if constexpr (ModifyDisplaySettings)
988+
{
985989
//-------------------------------------------------------------------------------------------------
986990
// LOD
987991
if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
@@ -1005,7 +1009,7 @@ static void setDefaults( void )
10051009
}
10061010
GadgetComboBoxSetSelectedPos( comboBoxResolution, defaultResIndex ); //should be 800x600 (our lowest supported mode)
10071011
}
1008-
1012+
}
10091013

10101014
//-------------------------------------------------------------------------------------------------
10111015
// Mouse Mode
@@ -1042,12 +1046,13 @@ static void setDefaults( void )
10421046
GadgetSliderGetMinMax(sliderGamma,&valMin, &valMax);
10431047
GadgetSliderSetPosition(sliderGamma, ((valMax - valMin) / 2 + valMin));
10441048

1045-
//-------------------------------------------------------------------------------------------------
1046-
// Texture resolution slider
1047-
//
1048-
1049+
if constexpr (ModifyDisplaySettings)
1050+
{
10491051
if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
10501052
{
1053+
//-------------------------------------------------------------------------------------------------
1054+
// Texture resolution slider
1055+
//
10511056
Int txtFact=TheGameLODManager->getRecommendedTextureReduction();
10521057

10531058
GadgetSliderSetPosition( sliderTextureResolution, 2-txtFact);
@@ -1112,6 +1117,7 @@ static void setDefaults( void )
11121117
//
11131118
GadgetCheckBoxSetChecked( checkProps, TheGlobalData->m_useTrees);
11141119
}
1120+
}
11151121
}
11161122

11171123
static void saveOptions( void )

0 commit comments

Comments
 (0)