[Scummvm-cvs-logs] scummvm master -> 2ef1ede691c56f9edca6325020602b99720e7a96

[dreammaster]

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

Summary:
ec5406377c SHERLOCK: RT: Fix crash from adding text window multiple times
2ef1ede691 SHERLOCK: RT: Further fixes for increased _sceneStats size


Commit: ec5406377c65fc67bca2c04a1912ba1b292eac25
    https://github.com/scummvm/scummvm/commit/ec5406377c65fc67bca2c04a1912ba1b292eac25
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-26T18:33:11-04:00

Commit Message:
SHERLOCK: RT: Fix crash from adding text window multiple times

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



diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index dbeeaf8..8303fd4 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -193,7 +193,7 @@ void TattooTalk::talkInterface(const byte *&str) {
 	}
 
 	// Display the text window
-//	ui.banishWindow();
+	ui.banishWindow();
 	ui._textWidget.load(Common::String((const char *)s, (const char *)str), _speaker);
 	ui._textWidget.summonWindow();
 	_wait = true;


Commit: 2ef1ede691c56f9edca6325020602b99720e7a96
    https://github.com/scummvm/scummvm/commit/2ef1ede691c56f9edca6325020602b99720e7a96
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-26T18:33:40-04:00

Commit Message:
SHERLOCK: RT: Further fixes for increased _sceneStats size

Changed paths:
    engines/sherlock/scene.cpp



diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index f56a510..24278cf 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1052,10 +1052,10 @@ void Scene::loadSceneSounds() {
 
 void Scene::checkSceneStatus() {
 	if (_sceneStats[_currentScene][MAX_BGSHAPES]) {
-		for (uint idx = 0; idx < 64; ++idx) {
+		for (int idx = 0; idx < MAX_BGSHAPES; ++idx) {
 			bool flag = _sceneStats[_currentScene][idx];
 
-			if (idx < _bgShapes.size()) {
+			if (idx < (int)_bgShapes.size()) {
 				Object &obj = _bgShapes[idx];
 
 				if (flag) {
@@ -1085,7 +1085,7 @@ void Scene::saveSceneStatus() {
 	}
 
 	// Flag scene as having been visited
-	_sceneStats[_currentScene][64] = true;
+	_sceneStats[_currentScene][MAX_BGSHAPES] = true;
 }
 
 void Scene::checkSceneFlags(bool flag) {