[Scummvm-cvs-logs] scummvm master -> 3be61257d00fa71c422ea1a5f297a657b63309e2

[fingolfin]

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:
7b47bf4638 TINSEL: Remove dead variables
3be61257d0 HUGO: Fix cypher fix ;)


Commit: 7b47bf4638462d44fb9e11b9f346bc2811f6f1f7
    https://github.com/scummvm/scummvm/commit/7b47bf4638462d44fb9e11b9f346bc2811f6f1f7
Author: Max Horn (max at quendi.de)
Date: 2011-03-29T15:07:16-07:00

Commit Message:
TINSEL: Remove dead variables

Changed paths:
    engines/tinsel/detection.cpp



diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index 22e8806..70bf398 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -280,11 +280,9 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList &
 
 	ADGameDescList matched;
 	int maxFilesMatched = 0;
-	bool gotAnyMatchesWithAllFiles = false;
 
 	// MD5 based matching
-	uint i;
-	for (i = 0, g = &Tinsel::gameDescriptions[0]; g->desc.gameid != 0; ++g) {
+	for (g = &Tinsel::gameDescriptions[0]; g->desc.gameid != 0; ++g) {
 		if (strcmp(g->desc.gameid, "dw2") != 0)
 			continue;
 
@@ -327,9 +325,6 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList &
 			}
 		}
 
-		if (allFilesPresent)
-			gotAnyMatchesWithAllFiles = true;
-
 		if (!fileMissing) {
 			// Count the number of matching files. Then, only keep those
 			// entries which match a maximal amount of files.


Commit: 3be61257d00fa71c422ea1a5f297a657b63309e2
    https://github.com/scummvm/scummvm/commit/3be61257d00fa71c422ea1a5f297a657b63309e2
Author: Max Horn (max at quendi.de)
Date: 2011-03-29T15:10:25-07:00

Commit Message:
HUGO: Fix cypher fix ;)

Changed paths:
    engines/hugo/file.cpp



diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp
index 5fd7bac..eb9e241 100644
--- a/engines/hugo/file.cpp
+++ b/engines/hugo/file.cpp
@@ -49,7 +49,7 @@ namespace Hugo {
 
 namespace {
 static const char *s_bootCypher = "Copyright 1992, David P Gray, Gray Design Associates";
-static const int s_bootCypherLen = strlen(s_bootCypher) - 1;
+static const int s_bootCypherLen = sizeof(s_bootCypher) - 2;
 }