[Scummvm-cvs-logs] scummvm master -> 6a80b9c2f8308c6bc667181668deaa2424288c2d

[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:
6a80b9c2f8 TSAGE: Renamings for R2R Spill Mountains large empty room


Commit: 6a80b9c2f8308c6bc667181668deaa2424288c2d
    https://github.com/scummvm/scummvm/commit/6a80b9c2f8308c6bc667181668deaa2424288c2d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-03T07:08:42-08:00

Commit Message:
TSAGE: Renamings for R2R Spill Mountains large empty room

Changed paths:
    engines/tsage/ringworld2/ringworld2_logic.cpp
    engines/tsage/ringworld2/ringworld2_scenes2.cpp
    engines/tsage/ringworld2/ringworld2_scenes2.h



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e37f64e..f778127 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -180,7 +180,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Spill Mountains: Balloon Launch Platform
 		return new Scene2350();
 	case 2400:
-		// Spill Mountains: Large empty room
+		// Spill Mountains: Unused large empty room
 		return new Scene2400();
 	case 2425:
 		// Spill Mountains: The Hall of Records
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 5246623..d2736be 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1217,7 +1217,7 @@ void Scene2350::process(Event &event) {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene2400::Exit1::changeScene() {
+void Scene2400::WestExit::changeScene() {
 	Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene;
 
 	R2_GLOBALS._player.disableControl();
@@ -1229,7 +1229,7 @@ void Scene2400::Exit1::changeScene() {
 
 }
 
-void Scene2400::Exit2::changeScene() {
+void Scene2400::EastExit::changeScene() {
 	Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene;
 
 	R2_GLOBALS._player.disableControl();
@@ -1243,10 +1243,10 @@ void Scene2400::Exit2::changeScene() {
 void Scene2400::postInit(SceneObjectList *OwnerList) {
 	loadScene(2400);
 	SceneExt::postInit();
-	_exit1.setDetails(Rect(0, 125, 14, 165), EXITCURSOR_W, 2000);
-	_exit1.setDest(Common::Point(14, 150));
-	_exit2.setDetails(Rect(305, 125, 320, 165), EXITCURSOR_E, 2000);
-	_exit2.setDest(Common::Point(315, 150));
+	_westExit.setDetails(Rect(0, 125, 14, 165), EXITCURSOR_W, 2000);
+	_westExit.setDest(Common::Point(14, 150));
+	_eastExit.setDetails(Rect(305, 125, 320, 165), EXITCURSOR_E, 2000);
+	_eastExit.setDest(Common::Point(315, 150));
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.disableControl();
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 9090e2d..ca5c4a0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -124,15 +124,15 @@ public:
 };
 
 class Scene2400 : public SceneExt {
-	class Exit1 : public SceneExit {
+	class WestExit : public SceneExit {
 		virtual void changeScene();
 	};
-	class Exit2 : public SceneExit {
+	class EastExit : public SceneExit {
 		virtual void changeScene();
 	};
 public:
-	Exit1 _exit1;
-	Exit2 _exit2;
+	WestExit _westExit;
+	EastExit _eastExit;
 	SequenceManager _sequenceManager;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);