diff options
| author | Strangerke | 2015-05-08 07:15:40 +0200 |
|---|---|---|
| committer | Strangerke | 2015-05-08 07:15:40 +0200 |
| commit | 8b7ebf4269adda0dbd33e559ab5e3de047411f82 (patch) | |
| tree | cb6cfce64d7db73610a5237fbc0b6665c9e7d7a2 /engines/sherlock | |
| parent | 9114ca839d0ed46a8bb7123be950343a9ba36c4e (diff) | |
| download | scummvm-rg350-8b7ebf4269adda0dbd33e559ab5e3de047411f82.tar.gz scummvm-rg350-8b7ebf4269adda0dbd33e559ab5e3de047411f82.tar.bz2 scummvm-rg350-8b7ebf4269adda0dbd33e559ab5e3de047411f82.zip | |
SHERLOCK: Fix some compilation warnings using GCC
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/map.h | 2 | ||||
| -rw-r--r-- | engines/sherlock/people.h | 3 | ||||
| -rw-r--r-- | engines/sherlock/screen.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h index e4c6655db9..b4e92c600f 100644 --- a/engines/sherlock/map.h +++ b/engines/sherlock/map.h @@ -41,7 +41,7 @@ struct MapEntry : Common::Point { MapEntry() : Common::Point(), _translate(-1) {} - MapEntry(int x, int y, int translate) : Common::Point(x, y), _translate(translate) {} + MapEntry(int posX, int posY, int translate) : Common::Point(posX, posY), _translate(translate) {} }; class MapPaths { diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h index 01ecd1a09a..02bb8dc950 100644 --- a/engines/sherlock/people.h +++ b/engines/sherlock/people.h @@ -45,8 +45,9 @@ enum { STOP_DOWN = 5, STOP_RIGHT = 6, STOP_UP = 7, WALK_UPRIGHT = 8, WALK_DOWNRIGHT = 9, WALK_UPLEFT = 10, WALK_DOWNLEFT = 11, STOP_UPRIGHT = 12, STOP_UPLEFT = 13, STOP_DOWNRIGHT = 14, - STOP_DOWNLEFT = 15, TALK_RIGHT = 6, TALK_LEFT = 4, + STOP_DOWNLEFT = 15, TALK_RIGHT = 6, TALK_LEFT = 4 }; + enum { MAP_UP = 1, MAP_UPRIGHT = 2, MAP_RIGHT = 1, MAP_DOWNRIGHT = 4, MAP_DOWN = 5, MAP_DOWNLEFT = 6, MAP_LEFT = 2, MAP_UPLEFT = 8 diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h index bbfba1c575..b57f535983 100644 --- a/engines/sherlock/screen.h +++ b/engines/sherlock/screen.h @@ -82,7 +82,7 @@ public: byte _sMap[PALETTE_SIZE]; public: Screen(SherlockEngine *vm); - ~Screen(); + virtual ~Screen(); void setFont(int fontNumber); |