[Scummvm-cvs-logs] scummvm master -> 8d804a855307ba8d16854ab12a1d5a1a576a6475

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bd45f291d5 TSAGE: Bugfix for using terminal in R2R scene 400
8d804a8553 TSAGE: Clean up comments in R2R scene factory method


Commit: bd45f291d5f11ba4884b22d22341baf9e43e2b2b
    https://github.com/scummvm/scummvm/commit/bd45f291d5f11ba4884b22d22341baf9e43e2b2b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-14T02:48:38-08:00

Commit Message:
TSAGE: Bugfix for using terminal in R2R scene 400

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index c3f97f1..61e3f8e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2569,6 +2569,8 @@ void Scene400::signal() {
 }
 
 void Scene400::dispatch() {
+	SceneExt::dispatch();
+
 	switch (R2_GLOBALS._player.getRegionIndex() - 15) {
 	case 0:
 	case 11:


Commit: 8d804a855307ba8d16854ab12a1d5a1a576a6475
    https://github.com/scummvm/scummvm/commit/8d804a855307ba8d16854ab12a1d5a1a576a6475
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-14T02:50:46-08:00

Commit Message:
TSAGE: Clean up comments in R2R scene factory method

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



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 8abe44a..ef1cb76 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -36,12 +36,15 @@ namespace Ringworld2 {
 Scene *Ringworld2Game::createScene(int sceneNumber) {
 	switch (sceneNumber) {
 	/* Scene group #0 */
-	//
-	case 50: return new Scene50();
-	// Quinn's room
-	case 100: return new Scene100();
-	// Computer console
-	case 125: return new Scene125();
+	case 50: 
+		// Waking up cutscene
+		return new Scene50();
+	case 100: 
+		// Quinn's room
+		return new Scene100();
+	case 125: 
+		// Computer console
+		return new Scene125();
 	case 150: 
 		// Empty Bedroom #1
 		return new Scene150();