[Scummvm-cvs-logs] scummvm master -> 35d44737ac37f71a9e973e4d3d3dc14651050b7f

[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:
35d44737ac TSAGE: Proper bugfix for the route used in Scene #5100 to escape the caves


Commit: 35d44737ac37f71a9e973e4d3d3dc14651050b7f
    https://github.com/scummvm/scummvm/commit/35d44737ac37f71a9e973e4d3d3dc14651050b7f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-29T05:55:17-07:00

Commit Message:
TSAGE: Proper bugfix for the route used in Scene #5100 to escape the caves

Changed paths:
    engines/tsage/ringworld_scenes6.cpp



diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index af9a4cb..ac17781 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -692,9 +692,9 @@ void Scene5100::Action2::signal() {
 		break;
 	case 3:
 		if (_globals->_player._position.x >= 966) {
-			ADD_PLAYER_MOVER(1215, 155);
+			ADD_PLAYER_MOVER_NULL(scene->_hotspot8, 1215, 155);
 		} else {
-			ADD_PLAYER_MOVER_THIS(scene->_hotspot8, 966, 185);
+			ADD_PLAYER_MOVER_NULL(scene->_hotspot8, 966, 185);
 		}
 
 		if (_globals->_player._position.x >= 966) {
@@ -704,7 +704,7 @@ void Scene5100::Action2::signal() {
 		}
 		break;
 	case 4:
-		ADD_PLAYER_MOVER_THIS(scene->_hotspot8, 1215, 155);
+		ADD_PLAYER_MOVER_NULL(scene->_hotspot8, 1215, 155);
 		ADD_PLAYER_MOVER(1215, 155);
 		break;
 	case 5:
@@ -1378,12 +1378,7 @@ void Scene5100::signal() {
 
 void Scene5100::dispatch() {
 	// Flesheater trap
-	//if (_hotspot15._bounds.contains(_globals->_player._position) && !_globals->_player._visage) {
-	// HACK: don't enable the flesheater trap if the player has the stasis box in the inventory.
-	// This ensures that Quinn does not fall in the trap during the cutscene where he escapes the
-	// caves with the Seeker.
-	if (_hotspot15._bounds.contains(_globals->_player._position) && !_globals->_player._visage &&
-		RING_INVENTORY._stasisBox._sceneNumber != 1) {
+	if (_hotspot15._bounds.contains(_globals->_player._position) && !_globals->_player._visage) {
 		_globals->_player.disableControl();
 		_globals->_player.addMover(NULL);