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

[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:
bd82ca97c2 TSAGE: Minor R2R scene bugfixes


Commit: bd82ca97c228edb1f526a8a88a9f370daab8de95
    https://github.com/scummvm/scummvm/commit/bd82ca97c228edb1f526a8a88a9f370daab8de95
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-06T14:01:49-07:00

Commit Message:
TSAGE: Minor R2R scene bugfixes

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 3b7d283..0c0376f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2708,6 +2708,8 @@ void Scene250::signal() {
 	case 7:
 		_field418 = 1;
 		if ((_field414 + 12) == _field412)
+			_sceneMode = 9;
+		else
 			_sceneMode = 8;
 		signal();
 		break;
@@ -3181,8 +3183,9 @@ void Scene300::synchronize(Serializer &s) {
 }
 
 void Scene300::postInit(SceneObjectList *OwnerList) {
-	SceneExt::postInit();
 	loadScene(300);
+	SceneExt::postInit();
+
 	_sound1.play(23);
 	setZoomPercents(75, 93, 120, 100);
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 5973698..dd29488 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1571,10 +1571,9 @@ void Scene1200::dispatch() {
 			break;
 		}
 		_mazeUI.setMazePosition(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
-		warning("int unk = set_pane_p(_paneNumber);");
-		_mazeUI.draw();
-		warning("_gfxManager.sub294AC(unk);");
-		warning("tmpRect.sub14DF3();");
+
+		debug("_gfxManager.sub294AC(unk);");
+		debug("tmpRect.sub14DF3();");
 
 		if (_field416 != 0) {
 			switch(_field412 - 1) {