[Scummvm-cvs-logs] scummvm master -> 991bcb680607853e79dcf2d5caa9cfe225d300a3

dreammaster dreammaster at scummvm.org
Wed Dec 14 11:45:23 CET 2011


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:
991bcb6806 TSAGE: Return to R2R scene 175 - Empty Bedroom #2


Commit: 991bcb680607853e79dcf2d5caa9cfe225d300a3
    https://github.com/scummvm/scummvm/commit/991bcb680607853e79dcf2d5caa9cfe225d300a3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-14T02:44:45-08:00

Commit Message:
TSAGE: Return to R2R scene 175 - Empty Bedroom #2

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



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index c6ad92b..8abe44a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -42,10 +42,14 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 100: return new Scene100();
 	// Computer console
 	case 125: return new Scene125();
-	// Empty Bedroom
-	case 150: return new Scene150();
+	case 150: 
+		// Empty Bedroom #1
+		return new Scene150();
 	case 160:
+		error("Missing scene %d from group 0", sceneNumber);
 	case 175:
+		// Empty Bedroom #2
+		return new Scene175();
 	case 180:
 		error("Missing scene %d from group 0", sceneNumber);
 	case 200:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 646d232..16133e8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -166,6 +166,9 @@ public:
 	virtual void signal();
 };
 
+class Scene175: public Scene150 {
+};
+
 class Scene200: public SceneExt {
 	/* Objects */
 	class NorthDoor: public SceneActor {






More information about the Scummvm-git-logs mailing list