aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/map.h
diff options
context:
space:
mode:
authorPaul Gilbert2015-04-28 21:35:20 -1000
committerPaul Gilbert2015-04-28 21:35:20 -1000
commit34a7ec7cdfe6b2eae699968afa28f2f75ee3126c (patch)
treedad8829c73b406099e217e468856f1dcd578d512 /engines/sherlock/map.h
parent7be410621e9fbc61ff4ec715044afaa79aa54717 (diff)
downloadscummvm-rg350-34a7ec7cdfe6b2eae699968afa28f2f75ee3126c.tar.gz
scummvm-rg350-34a7ec7cdfe6b2eae699968afa28f2f75ee3126c.tar.bz2
scummvm-rg350-34a7ec7cdfe6b2eae699968afa28f2f75ee3126c.zip
SHERLOCK: Fix icon disappearing when moving to Covent Gradens on map
Co-ordinates in Sherlock are frequently multiplied by 100. Thus, on the overland map, the values can go up to 64000, which overflows the signed 16-bit values allowed by the standard Common::Point class
Diffstat (limited to 'engines/sherlock/map.h')
-rw-r--r--engines/sherlock/map.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 564ae73691..435ca8d5d7 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -68,7 +68,7 @@ private:
ImageFile *_shapes;
ImageFile *_iconShapes;
byte _sequences[MAX_HOLMES_SEQUENCE][MAX_FRAME];
- Common::Point _lDrawnPos;
+ Point32 _lDrawnPos;
int _point;
bool _placesShown;
int _cursorIndex;
@@ -96,8 +96,8 @@ private:
void highlightIcon(const Common::Point &pt);
public:
bool _active;
- Common::Point _overPos;
- Common::Point _bigPos;
+ Point32 _overPos;
+ Point32 _bigPos;
int _charPoint, _oldCharPoint;
public:
Map(SherlockEngine *vm);