[Scummvm-cvs-logs] scummvm master -> 89cc1ce00450e3b0a19b660e7668ed6362e116fa

[Strangerke]

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:
0805549e1a TSAGE: Fix bug "Scene 2100: If you sit down at Quinn's console and then get back up again, his walk animation gets screw
89cc1ce004 TSAGE: Fix bug "Scene 2320: If you try to activate the flycycle, [...] the game becomes unresponsive.".


Commit: 0805549e1a8fa2cd17f332b6364d3e15eb832c77
    https://github.com/scummvm/scummvm/commit/0805549e1a8fa2cd17f332b6364d3e15eb832c77
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-24T10:13:51-07:00

Commit Message:
TSAGE: Fix bug "Scene 2100: If you sit down at Quinn's console and then get back up again, his walk animation gets screwed"

Changed paths:
    engines/tsage/ringworld_scenes3.cpp



diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index 9931d89..0a64b87 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -1401,6 +1401,7 @@ void Scene2100::Hotspot8::doAction(int action) {
 }
 
 void Scene2100::Hotspot10::doAction(int action) {
+	// Quinn's Console
 	Scene2100 *scene = (Scene2100 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -1415,6 +1416,7 @@ void Scene2100::Hotspot10::doAction(int action) {
 		} else if (_globals->getFlag(13)) {
 			SceneItem::display2(2100, 28);
 		} else {
+			scene->_sceneMode = 2101;
 			scene->setAction(&scene->_sequenceManager, scene, 2101, &_globals->_player, NULL);
 		}
 		break;


Commit: 89cc1ce00450e3b0a19b660e7668ed6362e116fa
    https://github.com/scummvm/scummvm/commit/89cc1ce00450e3b0a19b660e7668ed6362e116fa
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-24T10:14:57-07:00

Commit Message:
TSAGE: Fix bug "Scene 2320: If you try to activate the flycycle, [...] the game becomes unresponsive.".

Also fix an animation bug related to display priorities

Changed paths:
    engines/tsage/ringworld_scenes3.cpp



diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index 0a64b87..53b02a7 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -5164,6 +5164,7 @@ void Scene2320::Action3::signal() {
 }
 
 void Scene2320::Action4::signal() {
+	// Fly Cycle actions
 	Scene2320 *scene = (Scene2320 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -5230,11 +5231,13 @@ void Scene2320::Action4::signal() {
 		setDelay(13);
 		break;
 	case 9:
-		if (!_globals->getFlag(109)) {
-			SceneItem::display2(2320, 19);
-		} else {
-			_globals->_sceneManager.changeScene(7600);
-		}
+		// Quinn sits in the flycycle
+		scene->_hotspot16.hide();
+		_globals->_player.setVisage(2323);
+		_globals->_player.setPosition(Common::Point(303, 176));
+		_globals->_player.setStrip(2);
+		_globals->_player.setFrame(1);
+		_globals->_player.animate(ANIM_MODE_5, this);
 		break;
 	case 10:
 		if (_globals->getFlag(109)) {
@@ -5291,6 +5294,7 @@ void Scene2320::Action4::signal() {
 		break;
 	}
 	case 18: {
+		scene->_hotspot16.fixPriority(149);
 		Common::Point pt(320, 202);
 		PlayerMover *mover = new PlayerMover();
 		scene->_hotspot16.addMover(mover, &pt, this);
@@ -5735,6 +5739,7 @@ void Scene2320::Hotspot14::doAction(int action) {
 }
 
 void Scene2320::Hotspot15::doAction(int action) {
+	// Left console (Flycycle console)
 	Scene2320 *scene = (Scene2320 *)_globals->_sceneManager._scene;
 
 	switch (action) {