[Scummvm-git-logs] scummvm master -> c5bfab60f74526c84be5de86fc1260ad29715dc4

[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:
c5bfab60f7 SHERLOCK: Fix missing haze when going to Cleopatra's Needle


Commit: c5bfab60f74526c84be5de86fc1260ad29715dc4
    https://github.com/scummvm/scummvm/commit/c5bfab60f74526c84be5de86fc1260ad29715dc4
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-08T19:17:58-08:00

Commit Message:
SHERLOCK: Fix missing haze when going to Cleopatra's Needle

In The Case of the Rose Tattoo, certain rooms have a hard-coded haze.
Ensure that this gets loaded even when going directly from the overhead
map to such a room. I could be wrong, but I believe Cleopatra's Needle
is the only such room that can be accessed directly from the map, but do
it for all rooms just in case.

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


diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index a0f792dea9..c6317116d3 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -89,6 +89,15 @@ void TattooEngine::initialize() {
 void TattooEngine::startScene() {
 	TattooUserInterface &ui = *(TattooUserInterface *)_ui;
 
+	if (_scene->_goToScene == OVERHEAD_MAP || _scene->_goToScene == OVERHEAD_MAP2) {
+		// Show the map
+		_scene->_currentScene = OVERHEAD_MAP;
+		_scene->_goToScene = _map->show();
+
+		_people->_savedPos = Common::Point(-1, -1);
+		_people->_savedPos._facing = -1;
+	}
+
 	switch (_scene->_goToScene) {
 	case 7:
 	case 8:
@@ -108,16 +117,6 @@ void TattooEngine::startScene() {
 		ui._lockoutTimer = STARTUP_KEYS_DISABLED_DELAY;
 		break;
 
-	case OVERHEAD_MAP:
-	case OVERHEAD_MAP2:
-		// Show the map
-		_scene->_currentScene = OVERHEAD_MAP;
-		_scene->_goToScene = _map->show();
-
-		_people->_savedPos = Common::Point(-1, -1);
-		_people->_savedPos._facing = -1;
-		break;
-
 	case 101:
 		// Darts Board minigame
 		_darts.playDarts(GAME_CRICKET);