KOTOR: Make option menus' adoptChanges() private

Each menu should call its own adoptChanges().
xoreos · Jul 8, 2018 · ba57eb7 · ba57eb7
1 parent ae3dfde
commit ba57eb7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/src/engines/kotor/gui/main/options.cpp b/src/engines/kotor/gui/main/options.cpp
@@ -100,18 +100,11 @@ void OptionsMenu::callbackActive(Widget &widget) {
 	}
 
 	if (widget.getTag() == "BTN_BACK") {
-		adoptChanges();
 		_returnCode = 1;
 		return;
 	}
 }
 
-void OptionsMenu::adoptChanges() {
-	dynamic_cast<OptionsGameplayMenu &>(*_gameplay).adoptChanges();
-	dynamic_cast<OptionsAutoPauseMenu &>(*_autopause).adoptChanges();
-}
-
-
 } // End of namespace KotOR
 
 } // End of namespace Engines
diff --git a/src/engines/kotor/gui/main/options.h b/src/engines/kotor/gui/main/options.h
@@ -48,8 +48,6 @@ class OptionsMenu : public GUI {
 	void callbackActive(Widget &widget);
 
 private:
-	void adoptChanges();
-
 	Common::ScopedPtr<GUI> _gameplay;
 	Common::ScopedPtr<GUI> _feedback;
 	Common::ScopedPtr<GUI> _autopause;

diff --git a/src/engines/kotor/gui/options/autopause.h b/src/engines/kotor/gui/options/autopause.h
@@ -38,8 +38,6 @@ class OptionsAutoPauseMenu : public GUI {
 
 	virtual void show();
 
-	void adoptChanges();
-
 protected:
 	void callbackActive(Widget &widget);
 
@@ -54,6 +52,8 @@ class OptionsAutoPauseMenu : public GUI {
 	void setDefault();
 	void readConfig();
 	void displayConfig();
+
+	void adoptChanges();
 };
 
 } // End of namespace KotOR

diff --git a/src/engines/kotor/gui/options/gameplay.cpp b/src/engines/kotor/gui/options/gameplay.cpp
@@ -109,6 +109,7 @@ void OptionsGameplayMenu::callbackActive(Widget &widget) {
 	}
 
 	if (widget.getTag() == "BTN_BACK") {
+		adoptChanges();
 		_returnCode = 1;
 		return;
 	}

diff --git a/src/engines/kotor/gui/options/gameplay.h b/src/engines/kotor/gui/options/gameplay.h
@@ -40,8 +40,6 @@ class OptionsGameplayMenu : public GUI {
 
 	virtual void show();
 
-	void adoptChanges();
-
 protected:
 	void callbackActive(Widget &widget);
 
@@ -61,6 +59,8 @@ class OptionsGameplayMenu : public GUI {
 	void displayConfig();
 
 	void updateDifficulty(int difficulty);
+
+	void adoptChanges();
 };
 
 } // End of namespace KotOR