aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/map.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-06-05 21:13:48 -0400
committerPaul Gilbert2015-06-05 21:13:48 -0400
commit9ada143d1450fcc61c6e3fbd505e1b04fe45140d (patch)
tree6fbc4cb399455ca05fb06736693ef895dbdbde04 /engines/sherlock/map.cpp
parentcf76576035e37d2d55524ca3a7ade3af9804c85d (diff)
downloadscummvm-rg350-9ada143d1450fcc61c6e3fbd505e1b04fe45140d.tar.gz
scummvm-rg350-9ada143d1450fcc61c6e3fbd505e1b04fe45140d.tar.bz2
scummvm-rg350-9ada143d1450fcc61c6e3fbd505e1b04fe45140d.zip
SHERLOCK: Further FIXED_INT_MULTIPLIER refactoring
Also converted multiplier factor from 100 to 1000, which will be needed for Rose Tattoo
Diffstat (limited to 'engines/sherlock/map.cpp')
-rw-r--r--engines/sherlock/map.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index ffbca3fb42..dfc9798822 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -392,8 +392,8 @@ void Map::updateMap(bool flushScreen) {
people[AL].adjustSprite();
- _lDrawnPos.x = hPos.x = people[AL]._position.x / 100 - _bigPos.x;
- _lDrawnPos.y = hPos.y = people[AL]._position.y / 100 - people[AL].frameHeight() - _bigPos.y;
+ _lDrawnPos.x = hPos.x = people[AL]._position.x / FIXED_INT_MULTIPLIER - _bigPos.x;
+ _lDrawnPos.y = hPos.y = people[AL]._position.y / FIXED_INT_MULTIPLIER - people[AL].frameHeight() - _bigPos.y;
// Draw the person icon
saveIcon(people[AL]._imageFrame, hPos);
@@ -407,8 +407,8 @@ void Map::updateMap(bool flushScreen) {
screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
} else if (!_drawMap) {
if (hPos.x > 0 && hPos.y >= 0 && hPos.x < SHERLOCK_SCREEN_WIDTH && hPos.y < SHERLOCK_SCREEN_HEIGHT)
- screen.flushImage(people[AL]._imageFrame, Common::Point(people[AL]._position.x / 100 - _bigPos.x,
- people[AL]._position.y / 100 - people[AL].frameHeight() - _bigPos.y),
+ screen.flushImage(people[AL]._imageFrame, Common::Point(people[AL]._position.x / FIXED_INT_MULTIPLIER - _bigPos.x,
+ people[AL]._position.y / FIXED_INT_MULTIPLIER - people[AL].frameHeight() - _bigPos.y),
&people[AL]._oldPosition.x, &people[AL]._oldPosition.y, &people[AL]._oldSize.x, &people[AL]._oldSize.y);
if (osPos.x != -1)