aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-05-28 08:44:22 -0400
committerPaul Gilbert2014-05-28 08:44:22 -0400
commit0e8bf7de56565508d8d61debb53bb85c64e38ad2 (patch)
tree4642218a85f4aeb1a82b248e38745bccd9334bc7
parent0eb5a7f0b27cdf49c4815fb02b9ee76959154be8 (diff)
downloadscummvm-rg350-0e8bf7de56565508d8d61debb53bb85c64e38ad2.tar.gz
scummvm-rg350-0e8bf7de56565508d8d61debb53bb85c64e38ad2.tar.bz2
scummvm-rg350-0e8bf7de56565508d8d61debb53bb85c64e38ad2.zip
MADS: Fix climbing up/down watch tower in scene 202
-rw-r--r--engines/mads/nebular/nebular_scenes2.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 6bea298027..2379cf2b30 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -751,14 +751,14 @@ int Scene202::subStep4(int randVal) {
void Scene202::preActions() {
Player &player = _vm->_game->_player;
- if (player._readyToWalk)
+ if (player._needToWalk)
_scene->_kernelMessages.reset();
- if (!_ladderTopFl && (_action.isAction(VERB_CLIMB_DOWN, NOUN_LADDER) || !player._readyToWalk)) {
+ if (_ladderTopFl && (_action.isAction(VERB_CLIMB_DOWN, NOUN_LADDER) || player._needToWalk)) {
if (_game._trigger == 0) {
_vm->_sound->command(29);
player._readyToWalk = false;
- _game._player._stepEnabled = false;
+ player._stepEnabled = false;
_scene->_sequences.remove(_globals._sequenceIndexes[9]);
_globals._sequenceIndexes[8] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[8], false, 6, 1, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[8], 1);
@@ -766,21 +766,21 @@ void Scene202::preActions() {
} else if (_game._trigger == 1) {
_scene->_sequences.updateTimeout(-1, _globals._sequenceIndexes[8]);
_scene->_dynamicHotspots.remove(_ladderHotspotId);
- _game._player._visible = true;
+ player._visible = true;
player._readyToWalk = true;
- _game._player._stepEnabled = true;
+ player._stepEnabled = true;
_ladderTopFl = false;
}
}
if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS) && (_action._activeAction._indirectObjectId > 0)) {
if (!player._readyToWalk || _ladderTopFl)
- _game._player._needToWalk = false;
+ player._needToWalk = false;
else
- _game._player._needToWalk = true;
+ player._needToWalk = true;
if (!_ladderTopFl)
- _game._player.walk(Common::Point(171, 122), FACING_NORTH);
+ player.walk(Common::Point(171, 122), FACING_NORTH);
}
}