[Scummvm-cvs-logs] scummvm master -> cb410d5837571fad42faea0c625c8479e4d9b876

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cb410d5837 TSAGE: Fixed Options dialog Sound button not showing sound dialog


Commit: cb410d5837571fad42faea0c625c8479e4d9b876
    https://github.com/scummvm/scummvm/commit/cb410d5837571fad42faea0c625c8479e4d9b876
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-04T04:17:20-07:00

Commit Message:
TSAGE: Fixed Options dialog Sound button not showing sound dialog

Changed paths:
    engines/tsage/dialogs.cpp
    engines/tsage/dialogs.h
    engines/tsage/ringworld/ringworld_logic.cpp



diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp
index d5e7b15..841a7b7 100644
--- a/engines/tsage/dialogs.cpp
+++ b/engines/tsage/dialogs.cpp
@@ -367,6 +367,7 @@ void OptionsDialog::show() {
 		_globals->_game->restartGame();
 	} else if (btn == &dlg->_btnSound) {
 		// Sound dialog
+		SoundDialog::execute();
 	} else if (btn == &dlg->_btnSave) {
 		// Save button
 		_globals->_game->saveGame();
@@ -414,5 +415,14 @@ OptionsDialog::OptionsDialog() {
 	setCenter(160, 100);
 }
 
+/*--------------------------------------------------------------------------*/
+
+void SoundDialog::execute() {
+	ConfigDialog *dlg = new ConfigDialog();
+	dlg->runModal();
+	delete dlg;
+	_globals->_soundManager.syncSounds();
+	_globals->_events.setCursorFromFlag();
+}
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/dialogs.h b/engines/tsage/dialogs.h
index 7355ea1..35ed60b 100644
--- a/engines/tsage/dialogs.h
+++ b/engines/tsage/dialogs.h
@@ -99,6 +99,13 @@ public:
 	static void show();
 };
 
+/*--------------------------------------------------------------------------*/
+
+class SoundDialog {
+public:
+	static void execute();
+};
+
 } // End of namespace TsAGE
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 366076d..72c5697 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -1449,15 +1449,10 @@ void RingworldGame::processEvent(Event &event) {
 			MessageDialog::show(HELP_MSG, OK_BTN_STRING);
 			break;
 
-		case Common::KEYCODE_F2: {
+		case Common::KEYCODE_F2:
 			// F2 - Sound Options
-			ConfigDialog *dlg = new ConfigDialog();
-			dlg->runModal();
-			delete dlg;
-			_globals->_soundManager.syncSounds();
-			_globals->_events.setCursorFromFlag();
+			SoundDialog::execute();
 			break;
-		}
 
 		case Common::KEYCODE_F3:
 			// F3 - Quit