From e9f196bb57d76476dcaf420b36558582f193de34 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Wed, 13 Apr 2016 16:22:51 +0300
Subject: TSAGE: Reduce GUI header dependencies

---
 engines/tsage/ringworld/ringworld_demo.cpp    | 7 ++-----
 engines/tsage/ringworld/ringworld_dialogs.h   | 2 +-
 engines/tsage/ringworld/ringworld_scenes2.cpp | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'engines/tsage/ringworld')

diff --git a/engines/tsage/ringworld/ringworld_demo.cpp b/engines/tsage/ringworld/ringworld_demo.cpp
index cd2ab07a50..9aab0c4d21 100644
--- a/engines/tsage/ringworld/ringworld_demo.cpp
+++ b/engines/tsage/ringworld/ringworld_demo.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "tsage/ringworld/ringworld_demo.h"
+#include "tsage/dialogs.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
@@ -79,11 +80,7 @@ void RingworldDemoGame::processEvent(Event &event) {
 
 		case Common::KEYCODE_F2: {
 			// F2 - Sound Options
-			ConfigDialog *dlg = new ConfigDialog();
-			dlg->runModal();
-			delete dlg;
-			g_globals->_soundManager.syncSounds();
-			g_globals->_events.setCursorFromFlag();
+			SoundDialog::execute();
 			break;
 		}
 
diff --git a/engines/tsage/ringworld/ringworld_dialogs.h b/engines/tsage/ringworld/ringworld_dialogs.h
index 68ac0a05f9..4753968bf3 100644
--- a/engines/tsage/ringworld/ringworld_dialogs.h
+++ b/engines/tsage/ringworld/ringworld_dialogs.h
@@ -23,7 +23,7 @@
 #ifndef TSAGE_RINGWORLD_DIALOGS_H
 #define TSAGE_RINGWORLD_DIALOGS_H
 
-#include "gui/options.h"
+#include "tsage/dialogs.h"
 #include "tsage/events.h"
 #include "tsage/graphics.h"
 #include "common/list.h"
diff --git a/engines/tsage/ringworld/ringworld_scenes2.cpp b/engines/tsage/ringworld/ringworld_scenes2.cpp
index 1140f6f3d1..6811d3c3e8 100644
--- a/engines/tsage/ringworld/ringworld_scenes2.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes2.cpp
@@ -22,6 +22,7 @@
 
 #include "common/config-manager.h"
 #include "tsage/ringworld/ringworld_scenes2.h"
+#include "tsage/dialogs.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
-- 
cgit v1.2.3