From 7a46c84c0d02ec3fb5aa9d607519af8fbcd2715e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 22:02:59 -0400
Subject: SHERLOCK: Beginnings of Rose Tattoo engine

---
 engines/sherlock/sherlock.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sherlock/sherlock.h')

diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 501fdcb292..e21ac8c6d6 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -62,8 +62,8 @@ enum GameType {
 	GType_RoseTattoo = 1
 };
 
-#define SHERLOCK_SCREEN_WIDTH 320
-#define SHERLOCK_SCREEN_HEIGHT 200
+#define SHERLOCK_SCREEN_WIDTH _vm->_screen->w
+#define SHERLOCK_SCREEN_HEIGHT _vm->_screen->h
 #define SHERLOCK_SCENE_HEIGHT 138
 
 struct SherlockGameDescription;
-- 
cgit v1.2.3


From 3683719932882ab60fa1a6c22d19889c9734c355 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 07:20:06 -0400
Subject: SHERLOCK: Implement remaining Rose Tattoo scene data loading

---
 engines/sherlock/sherlock.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines/sherlock/sherlock.h')

diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 9261ad5b05..2688b51d4c 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -139,6 +139,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
-- 
cgit v1.2.3


From 1a1010f0ab4164bb615283f9c332afbf97f702ca Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 25 May 2015 11:04:34 -0400
Subject: SHERLOCK: Cleanup of checkBgShapes and updateBackground

---
 engines/sherlock/sherlock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sherlock/sherlock.h')

diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index bf8c0d6aaf..467f20e381 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -60,7 +60,7 @@ enum GameType {
 
 #define SHERLOCK_SCREEN_WIDTH _vm->_screen->w()
 #define SHERLOCK_SCREEN_HEIGHT _vm->_screen->h()
-#define SHERLOCK_SCENE_HEIGHT 138
+#define SHERLOCK_SCENE_HEIGHT (IS_SERRATED_SCALPEL ? 138 : 480)
 
 struct SherlockGameDescription;
 
-- 
cgit v1.2.3