diff options
author | agent-q | 2011-05-21 16:01:26 +0100 |
---|---|---|
committer | agent-q | 2011-05-21 16:01:26 +0100 |
commit | 92d0216db18c96c97bb4b57ada76cf532838cf5b (patch) | |
tree | 6d405ce821d055403a10aa347e8ae2826917bba1 /engines/scumm | |
parent | 4076a0466d67d42f093e3e73a30ea48e1e1d59e9 (diff) | |
parent | dd6b5698b181532b37cba41b1475b01813aadddc (diff) | |
download | scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.gz scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.bz2 scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.zip |
Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/actor.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 13581c4b45..9ea66807f0 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -177,9 +177,21 @@ void Actor::setBox(int box) { } void Actor_v3::setupActorScale() { - // TODO: The following could probably be removed - _scalex = 0xFF; - _scaley = 0xFF; + // WORKAROUND bug #1463598: Under certain circumstances, it is possible + // for Henry Sr. to reach the front side of Castle Brunwald (following + // Indy there). But it seems the game has no small costume for Henry, + // hence he is shown as a giant, triple in size compared to Indy. + // To workaround this, we override the scale of Henry. Since V3 games + // like Indy3 don't use the costume scale otherwise, this works fine. + // The scale factor 0x50 was determined by some guess work. + if (_number == 2 && _costume == 7 && _vm->_game.id == GID_INDY3 && _vm->_currentRoom == 12) { + _scalex = 0x50; + _scaley = 0x50; + } else { + // TODO: The following could probably be removed + _scalex = 0xFF; + _scaley = 0xFF; + } } void Actor::setupActorScale() { |