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

[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:
a255461ab3 TSAGE: Move the RingworldDemoGame class to the ringworld_demo file


Commit: a255461ab33e14dfacf399fcbac88e88c7a54d1f
    https://github.com/scummvm/scummvm/commit/a255461ab33e14dfacf399fcbac88e88c7a54d1f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-14T00:53:33-07:00

Commit Message:
TSAGE: Move the RingworldDemoGame class to the ringworld_demo file

Changed paths:
    engines/tsage/globals.cpp
    engines/tsage/ringworld_demo.cpp
    engines/tsage/ringworld_demo.h
    engines/tsage/ringworld_logic.cpp
    engines/tsage/ringworld_logic.h



diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 5020cfb..bff1bde 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 ebb7ca2..f6e915b 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 d5d9c10..d72db9c 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 0782ef5..9eba3bf 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 2faedf2..e3671e7 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