diff options
| author | Paul Gilbert | 2011-04-29 22:55:17 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-04-29 22:55:17 +1000 |
| commit | 35d44737ac37f71a9e973e4d3d3dc14651050b7f (patch) | |
| tree | 31f75139abdbabbc996cb4c49f6cc17680e6c7dd | |
| parent | b3e1329cb3f750adfec76478b099d183a11df5b8 (diff) | |
| download | scummvm-rg350-35d44737ac37f71a9e973e4d3d3dc14651050b7f.tar.gz scummvm-rg350-35d44737ac37f71a9e973e4d3d3dc14651050b7f.tar.bz2 scummvm-rg350-35d44737ac37f71a9e973e4d3d3dc14651050b7f.zip | |
TSAGE: Proper bugfix for the route used in Scene #5100 to escape the caves
| -rw-r--r-- | engines/tsage/ringworld_scenes6.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp index af9a4cbb93..ac177810c7 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); |