[Scummvm-cvs-logs] scummvm master -> 6511f2ec2cc8bb1741e989e8d924a4708f3f04a4

[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:
6511f2ec2c SHERLOCK: Replace various scene numbers with enum values


Commit: 6511f2ec2cc8bb1741e989e8d924a4708f3f04a4
    https://github.com/scummvm/scummvm/commit/6511f2ec2cc8bb1741e989e8d924a4708f3f04a4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-23T16:01:32-04:00

Commit Message:
SHERLOCK: Replace various scene numbers with enum values

Changed paths:
    engines/sherlock/scalpel/scalpel_scene.cpp
    engines/sherlock/tattoo/tattoo_scene.h
    engines/sherlock/tattoo/tattoo_user_interface.cpp
    engines/sherlock/tattoo/widget_talk.cpp
    engines/sherlock/tattoo/widget_tooltip.cpp



diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp
index ff92b50..e4c938f 100644
--- a/engines/sherlock/scalpel/scalpel_scene.cpp
+++ b/engines/sherlock/scalpel/scalpel_scene.cpp
@@ -225,7 +225,7 @@ void ScalpelScene::doBgAnim() {
 				_canimShapes[idx].checkObject();
 		}
 
-		if (_currentScene == 12)
+		if (_currentScene == DRAWING_ROOM)
 			vm.eraseMirror12();
 
 		// Restore the back buffer from the back buffer 2 in the changed area
@@ -297,7 +297,7 @@ void ScalpelScene::doBgAnim() {
 	// Flag the bg shapes which need to be redrawn
 	checkBgShapes();
 
-	if (_currentScene == 12)
+	if (_currentScene == DRAWING_ROOM)
 		vm.doMirror12();
 
 	// Draw all active shapes which are behind the person
@@ -407,7 +407,7 @@ void ScalpelScene::doBgAnim() {
 			}
 		}
 
-		if (_currentScene == 12)
+		if (_currentScene == DRAWING_ROOM)
 			vm.flushMirror12();
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
diff --git a/engines/sherlock/tattoo/tattoo_scene.h b/engines/sherlock/tattoo/tattoo_scene.h
index ade4b00..8d6a2ba 100644
--- a/engines/sherlock/tattoo/tattoo_scene.h
+++ b/engines/sherlock/tattoo/tattoo_scene.h
@@ -34,7 +34,7 @@ namespace Tattoo {
 extern const int FS_TRANS[8];
 
 enum {
-	STARTING_GAME_SCENE = 1,  STARTING_INTRO_SCENE = 91, OVERHEAD_MAP2 = 90, OVERHEAD_MAP = 100
+	STARTING_GAME_SCENE = 1, WEARY_PUNT = 52, STARTING_INTRO_SCENE = 91, OVERHEAD_MAP2 = 90, OVERHEAD_MAP = 100
 };
 
 struct SceneTripEntry {
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 76d1af1..a374210 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -556,7 +556,7 @@ void TattooUserInterface::displayObjectNames() {
 	Common::Point mousePos = events.mousePos();
 	_arrowZone = -1;
 
-	if (_bgFound == -1 || scene._currentScene == 90) {
+	if (_bgFound == -1 || scene._currentScene == OVERHEAD_MAP2) {
 		for (uint idx = 0; idx < scene._exits.size() && _arrowZone == -1; ++idx) {
 			Exit &exit = scene._exits[idx];
 			if (exit.contains(mousePos))
diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp
index a5afa0c..b0cc7bc 100644
--- a/engines/sherlock/tattoo/widget_talk.cpp
+++ b/engines/sherlock/tattoo/widget_talk.cpp
@@ -243,7 +243,7 @@ void WidgetTalk::handleEvents() {
 			banishWindow();
 			ui._menuMode = scene._labTableScene ? LAB_MODE : STD_MODE;
 
-			if (scene._currentScene == 52)
+			if (scene._currentScene == WEARY_PUNT)
 				callParrotFile = true;
 		}
 
diff --git a/engines/sherlock/tattoo/widget_tooltip.cpp b/engines/sherlock/tattoo/widget_tooltip.cpp
index 9dfa1ea..3d2ca1f 100644
--- a/engines/sherlock/tattoo/widget_tooltip.cpp
+++ b/engines/sherlock/tattoo/widget_tooltip.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/tattoo/widget_tooltip.h"
 #include "sherlock/tattoo/tattoo_map.h"
+#include "sherlock/tattoo/tattoo_scene.h"
 #include "sherlock/tattoo/tattoo_user_interface.h"
 #include "sherlock/tattoo/tattoo.h"
 
@@ -184,7 +185,7 @@ void WidgetSceneTooltip::handleEvents() {
 			Common::String str;
 			if (ui._bgFound != -1) {
 				// Clear the Arrow Zone fields so it won't think we're displaying an Arrow Zone cursor
-				if (scene._currentScene != 90)  // RRR Take out the cludge for room 90
+				if (scene._currentScene != OVERHEAD_MAP2)
 					ui._arrowZone = ui._oldArrowZone = -1;
 
 				// Get the description string