diff options
| author | Paul Gilbert | 2015-05-30 10:46:19 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-30 10:46:19 -0400 |
| commit | 6b95fc6b1132cf5ce6edc4216368bd38eddc939b (patch) | |
| tree | 45f0d9fa5e65ae9f42fefb301498c2dd704bf772 /engines/sherlock/sherlock.h | |
| parent | c3712f9a73eb7511c2a5bea20aa61ea21d3258f4 (diff) | |
| parent | 895189e3ffd1931ca01991731f98bbf74796e05d (diff) | |
| download | scummvm-rg350-6b95fc6b1132cf5ce6edc4216368bd38eddc939b.tar.gz scummvm-rg350-6b95fc6b1132cf5ce6edc4216368bd38eddc939b.tar.bz2 scummvm-rg350-6b95fc6b1132cf5ce6edc4216368bd38eddc939b.zip | |
Merge branch 'sherlock2'
Diffstat (limited to 'engines/sherlock/sherlock.h')
| -rw-r--r-- | engines/sherlock/sherlock.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h index 2e85651700..e71c729893 100644 --- a/engines/sherlock/sherlock.h +++ b/engines/sherlock/sherlock.h @@ -59,9 +59,9 @@ enum GameType { GType_RoseTattoo = 1 }; -#define SHERLOCK_SCREEN_WIDTH 320 -#define SHERLOCK_SCREEN_HEIGHT 200 -#define SHERLOCK_SCENE_HEIGHT 138 +#define SHERLOCK_SCREEN_WIDTH _vm->_screen->w() +#define SHERLOCK_SCREEN_HEIGHT _vm->_screen->h() +#define SHERLOCK_SCENE_HEIGHT (IS_SERRATED_SCALPEL ? 138 : 480) struct SherlockGameDescription; @@ -199,6 +199,9 @@ public: void synchronize(Common::Serializer &s); }; +#define IS_ROSE_TATTOO (_vm->getGameID() == GType_RoseTattoo) +#define IS_SERRATED_SCALPEL (_vm->getGameID() == GType_SerratedScalpel) + } // End of namespace Sherlock #endif |