[Scummvm-cvs-logs] scummvm master -> 836f99e2ef04a2b35846ef0e9ff5781652b3c295

[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:
836f99e2ef TSAGE: Bugfixes for Ringworld demo - demo is now completable with some remaining gfx glitches


Commit: 836f99e2ef04a2b35846ef0e9ff5781652b3c295
    https://github.com/scummvm/scummvm/commit/836f99e2ef04a2b35846ef0e9ff5781652b3c295
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-25T04:41:13-07:00

Commit Message:
TSAGE: Bugfixes for Ringworld demo - demo is now completable with some remaining gfx glitches

Changed paths:
    engines/tsage/converse.cpp
    engines/tsage/ringworld_demo.cpp



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 8d02624..be072c3 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -244,6 +244,7 @@ void SequenceManager::signal() {
 		}
 		case 28:
 			_objectIndex = getNextValue();
+			assert((_objectIndex >= 0) && (_objectIndex < 6));
 			_sceneObject = _objectList[_objectIndex];
 			assert(_sceneObject);
 			break;
@@ -272,14 +273,15 @@ void SequenceManager::signal() {
 		case 34: {
 			v1 = getNextValue();
 			v2 = getNextValue();
-			int objIndex1 = getNextValue();
-			int objIndex2 = getNextValue();
-			int objIndex3 = getNextValue();
-			int objIndex4 = getNextValue();
-			int objIndex5 = getNextValue();
+			int objIndex1 = getNextValue() - 1;
+			int objIndex2 = getNextValue() - 1;
+			int objIndex3 = getNextValue() - 1;
+			int objIndex4 = getNextValue() - 1;
+			int objIndex5 = getNextValue() - 1;
+			int objIndex6 = getNextValue() - 1;
 
 			setAction(globalManager(), v2 ? this : NULL, v1, _objectList[objIndex1], _objectList[objIndex2],
-				_objectList[objIndex3], _objectList[objIndex4], _objectList[objIndex5]);
+				_objectList[objIndex3], _objectList[objIndex4], _objectList[objIndex5], _objectList[objIndex6], NULL);
 			break;
 		}
 		default:
diff --git a/engines/tsage/ringworld_demo.cpp b/engines/tsage/ringworld_demo.cpp
index 3f87e8d..29438c0 100644
--- a/engines/tsage/ringworld_demo.cpp
+++ b/engines/tsage/ringworld_demo.cpp
@@ -43,7 +43,7 @@ void RingworldDemoScene::signal() {
 	_soundHandler.startSound(4);
 	_actor1.postInit();
 	_actor2.postInit();
-	_actor1.postInit();
+	_actor3.postInit();
 	_actor4.postInit();
 	_actor5.postInit();
 	_actor6.postInit();