diff options
author | Paul Gilbert | 2015-03-09 20:02:55 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-03-09 20:02:55 -0400 |
commit | 82faf6b50da5996b1783877a9c2685d8272ffc0e (patch) | |
tree | 332049bed54546320d69a69e22502f8dead556be /engines/mads | |
parent | f37a0b215515e5466bd19c8953c4f53ff4823a59 (diff) | |
download | scummvm-rg350-82faf6b50da5996b1783877a9c2685d8272ffc0e.tar.gz scummvm-rg350-82faf6b50da5996b1783877a9c2685d8272ffc0e.tar.bz2 scummvm-rg350-82faf6b50da5996b1783877a9c2685d8272ffc0e.zip |
MADS: Fix walking to exit in guard room after dropping severed arm
Diffstat (limited to 'engines/mads')
-rw-r--r-- | engines/mads/nebular/nebular_scenes3.cpp | 3 | ||||
-rw-r--r-- | engines/mads/player.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp index 2ea476008f..8f07993e07 100644 --- a/engines/mads/nebular/nebular_scenes3.cpp +++ b/engines/mads/nebular/nebular_scenes3.cpp @@ -4152,7 +4152,7 @@ void Scene352::setup() { void Scene352::putArmDown(bool corridorExit, bool doorwayExit) { switch (_game._trigger) { case 0: - _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 60, _game.getQuote(0xFF)); + _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0xFF)); _scene->_sequences.addTimer(48, 1); break; @@ -4197,7 +4197,6 @@ void Scene352::putArmDown(bool corridorExit, bool doorwayExit) { case 4: _game._player.walk(Common::Point(116, 107), FACING_NORTH); - _game._player._stepEnabled = true; _mustPutArmDownFl = false; _scene->_sequences.addTimer(180, 5); _leaveRoomFl = true; diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp index 68e0355df9..38e8638415 100644 --- a/engines/mads/player.cpp +++ b/engines/mads/player.cpp @@ -664,7 +664,7 @@ void Player::startMovement() { _deltaDistance = (majorChange == 0) ? 0 : _totalDistance / majorChange; if (_playerPos.x > _targetPos.x) - _pixelAccum = MAX(_posChange.x, _posChange.y); + _pixelAccum = MIN(_posChange.x, _posChange.y); else _pixelAccum = 0; |