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

Strangerke arnaud.boutonne at gmail.com
Fri May 27 20:54:02 CEST 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:
edbc712a0f TSAGE: Fix (second) bug "Scene 2100: If you sit down at Quinn's console and then get back up again, his walk animation g


Commit: edbc712a0fd0c2486b5e8205dc970f1b299b0c5e
    https://github.com/scummvm/scummvm/commit/edbc712a0fd0c2486b5e8205dc970f1b299b0c5e
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-27T11:53:05-07:00

Commit Message:
TSAGE: Fix (second) 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 4d2225e..c449d01 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -655,6 +655,7 @@ void Scene2100::Action4::signal() {
 }
 
 void Scene2100::Action5::signal() {
+	// Quinn enters the cokpit after Seeker decided to enter the cave alone
 	Scene2100 *scene = (Scene2100 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1416,6 +1417,7 @@ void Scene2100::Hotspot10::doAction(int action) {
 		} else if (_globals->getFlag(13)) {
 			SceneItem::display2(2100, 28);
 		} else {
+			_globals->_player.disableControl();
 			scene->_sceneMode = 2101;
 			scene->setAction(&scene->_sequenceManager, scene, 2101, &_globals->_player, NULL);
 		}
@@ -1499,6 +1501,7 @@ void Scene2100::Object2::doAction(int action) {
 }
 
 void Scene2100::Object3::doAction(int action) {
+	// Miranda
 	Scene2100 *scene = (Scene2100 *)_globals->_sceneManager._scene;
 
 	switch (action) {






More information about the Scummvm-git-logs mailing list