aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-03-19 00:46:15 +0000
committerTravis Howell2005-03-19 00:46:15 +0000
commit6381320defd9300133732879d3746ae2ab89433f (patch)
tree9c7e01a299bb17e3dad0912f4e5d7f52650ddb10
parentf258c52bfc22b7ab12df57c946a6edaf24f57072 (diff)
downloadscummvm-rg350-6381320defd9300133732879d3746ae2ab89433f.tar.gz
scummvm-rg350-6381320defd9300133732879d3746ae2ab89433f.tar.bz2
scummvm-rg350-6381320defd9300133732879d3746ae2ab89433f.zip
Add bug fix from cyx for:
883415 - COMI: Guybrush appears above tomb svn-id: r17183
-rw-r--r--scumm/actor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 1266f6820b..ba1c1b81ad 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -646,7 +646,7 @@ AdjustBoxResult Actor::adjustXYToBeInBox(int dstX, int dstY) {
if (numBoxes < firstValidBox)
return abr;
- bestDist = 0xFFFF;
+ bestDist = (_vm->_version >= 7) ? 0x7FFFFFFF : 0xFFFF;
if (_vm->_version <= 2)
bestDist *= 8*2; // Adjust for the fact that we multiply x by 8 and y by 2
bestBox = kInvalidBox;