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

[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:
d8d475b271 SHERLOCK: RT: Fix initialization and saving of inv item requiredFlag values


Commit: d8d475b271d25cb3086de1ca9c162999da7899ac
    https://github.com/scummvm/scummvm/commit/d8d475b271d25cb3086de1ca9c162999da7899ac
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-30T08:30:25-04:00

Commit Message:
SHERLOCK: RT: Fix initialization and saving of inv item requiredFlag values

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



diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index c571f27..cca4184 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1377,7 +1377,7 @@ void Scene::synchronize(Serializer &s) {
 		_loadingSavedGame = true;
 	}
 
-	for (int sceneNum = 0; sceneNum < SCENES_COUNT; ++sceneNum) {
+	for (int sceneNum = 1; sceneNum < SCENES_COUNT; ++sceneNum) {
 		for (int flag = 0; flag <= MAX_BGSHAPES; ++flag) {
 			s.syncAsByte(_sceneStats[sceneNum][flag]);
 		}
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 028650d..110d13b 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -170,9 +170,9 @@ void TattooEngine::loadInventory() {
 	inv.push_back(InventoryItem(0, inv5, invDesc5, "_ITEM05A"));
 
 	// Hidden items
-	inv.push_back(InventoryItem(0, inv6, invDesc6, "_PAP212D", solve));
-	inv.push_back(InventoryItem(0, inv7, invDesc7, "_PAP212I"));
-	inv.push_back(InventoryItem(0, inv8, invDesc8, "_LANT02I"));
+	inv.push_back(InventoryItem(295, inv6, invDesc6, "_PAP212D", solve));
+	inv.push_back(InventoryItem(294, inv7, invDesc7, "_PAP212I"));
+	inv.push_back(InventoryItem(818, inv8, invDesc8, "_LANT02I"));
 }
 
 void TattooEngine::doHangManPuzzle() {