TSAGE: Move the RingworldDemoGame class to the ringworld_demo file

5 files changed, 22 insertions, 25 deletions

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 5020cfbc7d..bff1bdeaa6 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -22,6 +22,7 @@
 
 #include "tsage/globals.h"
 #include "tsage/tsage.h"
+#include "tsage/ringworld_demo.h"
 #include "tsage/ringworld_logic.h"
 
 namespace tSage {
diff --git a/engines/tsage/ringworld_demo.cpp b/engines/tsage/ringworld_demo.cpp
index ebb7ca2175..f6e915b710 100644
--- a/engines/tsage/ringworld_demo.cpp
+++ b/engines/tsage/ringworld_demo.cpp
@@ -27,6 +27,16 @@
 
 namespace tSage {
 
+void RingworldDemoGame::start() {
+	// Start the demo's single scene
+	_globals->_sceneManager.changeScene(1);
+	
+	_globals->_events.setCursor(CURSOR_NONE);
+}
+
+void RingworldDemoGame::restart() {
+}
+
 /*--------------------------------------------------------------------------
  * Ringworld Demo scene
  *
diff --git a/engines/tsage/ringworld_demo.h b/engines/tsage/ringworld_demo.h
index d5d9c100b7..d72db9c9a4 100644
--- a/engines/tsage/ringworld_demo.h
+++ b/engines/tsage/ringworld_demo.h
@@ -31,6 +31,17 @@
 
 namespace tSage {
 
+class RingworldDemoGame: public Game {
+protected:
+	virtual void restart();
+public:
+	virtual void start();
+	virtual void restartGame() {}
+	virtual void saveGame() {}
+	virtual void restoreGame() {}
+	virtual void quitGame() {}
+	virtual void endGame(int resNum, int lineNum) {}
+};
 
 class RingworldDemoScene: public Scene {
 public:
diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index 0782ef532c..9eba3bf00b 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -1424,16 +1424,4 @@ void RingworldGame::endGame(int resNum, int lineNum) {
 	_globals->_events.setCursorFromFlag();
 }
 
-/*--------------------------------------------------------------------------*/
-
-void RingworldDemoGame::start() {
-	// Start the demo's single scene
-	_globals->_sceneManager.changeScene(1);
-	
-	_globals->_events.setCursor(CURSOR_NONE);
-}
-
-void RingworldDemoGame::restart() {
-}
-
 } // End of namespace tSage
diff --git a/engines/tsage/ringworld_logic.h b/engines/tsage/ringworld_logic.h
index 2faedf2d60..e3671e7fe2 100644
--- a/engines/tsage/ringworld_logic.h
+++ b/engines/tsage/ringworld_logic.h
@@ -453,19 +453,6 @@ public:
 	virtual void endGame(int resNum, int lineNum);
 };
 
-class RingworldDemoGame: public Game {
-protected:
-	virtual void restart();
-public:
-	virtual void start();
-	virtual void restartGame() {}
-	virtual void saveGame() {}
-	virtual void restoreGame() {}
-	virtual void quitGame() {}
-	virtual void endGame(int resNum, int lineNum) {}
-};
-
-
 } // End of namespace tSage
 
 #endif