KOTOR: Query option defaults from the ConfigManager

xoreos · Jul 8, 2018 · cc8955b · cc8955b
1 parent 17a0b65
commit cc8955b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 23 deletions.
diff --git a/src/engines/kotor/gui/options/autopause.cpp b/src/engines/kotor/gui/options/autopause.cpp
@@ -104,12 +104,12 @@ void OptionsAutoPauseMenu::callbackActive(Widget &widget) {
 }
 
 void OptionsAutoPauseMenu::setDefault() {
-	_endOfCombatRound = false;
-	_enemySighted = true;
-	_mineSighted = true;
-	_partyMemberDown = true;
-	_actionMenuUsed = false;
-	_newTargetSelected = true;
+	_endOfCombatRound = ConfigMan.getDefaultBool("endofcombatround");
+	_enemySighted = ConfigMan.getDefaultBool("enemysighted");
+	_mineSighted = ConfigMan.getDefaultBool("minesighted");
+	_partyMemberDown = ConfigMan.getDefaultBool("partymemberdown");
+	_actionMenuUsed = ConfigMan.getDefaultBool("actionmenuused");
+	_newTargetSelected = ConfigMan.getDefaultBool("newtargetselected");
 }
 
 void OptionsAutoPauseMenu::readConfig() {

diff --git a/src/engines/kotor/gui/options/gameplay.cpp b/src/engines/kotor/gui/options/gameplay.cpp
@@ -141,12 +141,13 @@ void OptionsGameplayMenu::callbackActive(Widget &widget) {
 }
 
 void OptionsGameplayMenu::setDefault() {
-	_difficulty = 1;
-	_autoLevelUp = false;
-	_mouseMove = false;
-	_autoSave = true;
-	_reverseMinigameY = false;
-	_combatMovement = true;
+	_difficulty = ConfigMan.getDefaultInt("difficulty");
+
+	_autoLevelUp = ConfigMan.getDefaultBool("autolevelup");
+	_mouseMove = ConfigMan.getDefaultBool("mousemove");
+	_autoSave = ConfigMan.getDefaultBool("autosave");
+	_reverseMinigameY = ConfigMan.getDefaultBool("reverseminigameyaxis");
+	_combatMovement = ConfigMan.getDefaultBool("combatmovement");
 }
 
 void OptionsGameplayMenu::readConfig() {

diff --git a/src/engines/kotor/gui/options/graphics.cpp b/src/engines/kotor/gui/options/graphics.cpp
@@ -96,8 +96,8 @@ void OptionsGraphicsMenu::callbackActive(Widget &widget) {
 }
 
 void OptionsGraphicsMenu::setDefault() {
-	_shadows = true;
-	_grass = true;
+	_shadows = ConfigMan.getDefaultBool("shadows");
+	_grass = ConfigMan.getDefaultBool("grass");
 }
 
 void OptionsGraphicsMenu::readConfig() {

diff --git a/src/engines/kotor/gui/options/graphicsadv.cpp b/src/engines/kotor/gui/options/graphicsadv.cpp
@@ -160,12 +160,12 @@ void OptionsGraphicsAdvancedMenu::callbackActive(Widget &widget) {
 }
 
 void OptionsGraphicsAdvancedMenu::setDefault() {
-	_textureQuality = 2;
-	_antiAliasing = 0;
-	_anisotropy = 0;
-	_frameBufferEffects = true;
-	_softShadows = true;
-	_vsync = false;
+	_textureQuality = ConfigMan.getDefaultInt("texturepack");
+	_antiAliasing = ConfigMan.getDefaultInt("antialiasing");
+	_anisotropy = ConfigMan.getDefaultInt("anisotropy");
+	_frameBufferEffects = ConfigMan.getDefaultBool("framebuffereffects");
+	_softShadows = ConfigMan.getDefaultBool("softshadows");
+	_vsync = ConfigMan.getDefaultBool("vsync");
 }
 
 void OptionsGraphicsAdvancedMenu::readConfig() {

diff --git a/src/engines/kotor/gui/options/mousesettings.cpp b/src/engines/kotor/gui/options/mousesettings.cpp
@@ -72,7 +72,7 @@ void OptionsMouseSettingsMenu::callbackActive(Widget &widget) {
 }
 
 void OptionsMouseSettingsMenu::setDefault() {
-	_reverseMouseButtons = false;
+	_reverseMouseButtons = ConfigMan.getDefaultBool("reversemousebuttons");
 }
 
 void OptionsMouseSettingsMenu::readConfig() {

diff --git a/src/engines/kotor/gui/options/soundadv.cpp b/src/engines/kotor/gui/options/soundadv.cpp
@@ -107,8 +107,8 @@ void OptionsSoundAdvancedMenu::callbackActive(Widget &widget) {
 }
 
 void OptionsSoundAdvancedMenu::setDefault() {
-	_eax = 0;
-	_forceSoftware = false;
+	_eax = ConfigMan.getDefaultInt("eax");
+	_forceSoftware = ConfigMan.getDefaultBool("forcesoftware");
 }
 
 void OptionsSoundAdvancedMenu::readConfig() {