aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-06-18 12:33:46 +0000
committerMax Horn2003-06-18 12:33:46 +0000
commitf0a39d718ae7aed246c91fb55a58a773553c6eca (patch)
tree375f0fcae8250151c285f7e84556e97952c2ff32
parenta0028d51d1f3ab6b66fbbc610653dc0c49311c8c (diff)
downloadscummvm-rg350-f0a39d718ae7aed246c91fb55a58a773553c6eca.tar.gz
scummvm-rg350-f0a39d718ae7aed246c91fb55a58a773553c6eca.tar.bz2
scummvm-rg350-f0a39d718ae7aed246c91fb55a58a773553c6eca.zip
fix for o5_walkActorToActor; this seems to be more like what V3 games expect (and fixes bug #755113); but I don't know for sure about V5 games (and I have to wonder if the corresponding code for V6 isn't maybe wrong, too...?)
svn-id: r8538
-rw-r--r--scumm/script_v5.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 9b87083f07..18ab35703e 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -2413,8 +2413,8 @@ void Scumm_v5::o5_walkActorToActor() {
if (_version <= 2)
dist *= 8;
else if (dist == 0xFF) {
- dist = a2->scalex * a2->width / 0xFF;
- dist += dist / 2;
+ dist = a->scalex * a->width / 0xFF;
+ dist += (a2->scalex * a2->width / 0xFF) / 2;
}
x = a2->x;
y = a2->y;