aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/object.cpp
diff options
context:
space:
mode:
authorMax Horn2006-10-19 00:26:55 +0000
committerMax Horn2006-10-19 00:26:55 +0000
commita0b9f78bd374c1844472c4b8de1b721c2745bc44 (patch)
treed2e198a0461c87a744a850c8c43775dd65b0d762 /engines/scumm/object.cpp
parent5148dbb3fb30303a562cd36e87d3ac805c69673e (diff)
downloadscummvm-rg350-a0b9f78bd374c1844472c4b8de1b721c2745bc44.tar.gz
scummvm-rg350-a0b9f78bd374c1844472c4b8de1b721c2745bc44.tar.bz2
scummvm-rg350-a0b9f78bd374c1844472c4b8de1b721c2745bc44.zip
SCUMM: Introduced V12_X_MULTIPLIER and V12_Y_MULTIPLIER to make it a bit easier to find spots where we convert between C64-style coordinates and pixel coordinates (but beware, this probably doesnt't cover all relevant instances)
svn-id: r24384
Diffstat (limited to 'engines/scumm/object.cpp')
-rw-r--r--engines/scumm/object.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index c5228add31..b95cfeab12 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -454,10 +454,10 @@ int ScummEngine::getObjActToObjActDist(int a, int b) {
// For V1/V2 games, distances are measured in the original "character"
// based coordinate system, instead of pixels. Otherwise various scripts
// will break. See bugs #853874, #774529
- x /= 8;
- y /= 2;
- x2 /= 8;
- y2 /= 2;
+ x /= V12_X_MULTIPLIER;
+ y /= V12_Y_MULTIPLIER;
+ x2 /= V12_X_MULTIPLIER;
+ y2 /= V12_Y_MULTIPLIER;
}
return getDist(x, y, x2, y2);