[Scummvm-cvs-logs] scummvm master -> aad99b770654e42b514beca9ec99d58f5e03a22f

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
aad99b7706 SHERLOCK: RT: Load screen masks for specific scenes


Commit: aad99b770654e42b514beca9ec99d58f5e03a22f
    https://github.com/scummvm/scummvm/commit/aad99b770654e42b514beca9ec99d58f5e03a22f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-21T22:03:29-04:00

Commit Message:
SHERLOCK: RT: Load screen masks for specific scenes

Changed paths:
    engines/sherlock/tattoo/tattoo.cpp



diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index dcea338..57b80ff 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -25,6 +25,7 @@
 #include "sherlock/tattoo/tattoo_fixed_text.h"
 #include "sherlock/tattoo/tattoo_resources.h"
 #include "sherlock/tattoo/tattoo_scene.h"
+#include "sherlock/tattoo/tattoo_user_interface.h"
 #include "sherlock/tattoo/widget_base.h"
 #include "sherlock/people.h"
 
@@ -81,7 +82,22 @@ void TattooEngine::initialize() {
 }
 
 void TattooEngine::startScene() {
+	TattooUserInterface &ui = *(TattooUserInterface *)_ui;
+
 	switch (_scene->_goToScene) {
+	case 7:
+	case 8:
+	case 18:
+	case 53:
+	case 68:
+		// Load overlay mask(s) for the scene
+		ui._mask = new ImageFile(Common::String::format("res%02d.msk", _scene->_goToScene));
+		if (_scene->_goToScene == 8)
+			ui._mask1 = new ImageFile("res08a.msk");
+		else if (_scene->_goToScene == 18 || _scene->_goToScene == 68)
+			ui._mask1 = new ImageFile("res08a.msk");
+		break;
+
 	case OVERHEAD_MAP:
 	case OVERHEAD_MAP2:
 		// Show the map