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

[wjp]

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:
ae683e33e1 SCI: Resolve duplicate resmap.001 check
ebf173b9ce SCI: Fix broken loop count check in checkAltInputs


Commit: ae683e33e16f1775c69ff8a942bae220cd98cbda
    https://github.com/scummvm/scummvm/commit/ae683e33e16f1775c69ff8a942bae220cd98cbda
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-10-28T21:40:14+02:00

Commit Message:
SCI: Resolve duplicate resmap.001 check

Before cef5506e9f0ba328a064f058f074c979b8ba6485, we used to check
for any files starting with resmap.00. We now check for resmap.000
and resmap.001.

Changed paths:
    engines/sci/detection.cpp



diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 83f1d30..a00da7c 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -556,7 +556,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 	s_fallbackDesc.guiOptions = GUIO3(GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI);
 
 	if (allFiles.contains("resource.map") || allFiles.contains("Data1")
-	    || allFiles.contains("resmap.001") || allFiles.contains("resmap.001")) {
+	    || allFiles.contains("resmap.000") || allFiles.contains("resmap.001")) {
 		foundResMap = true;
 	}
 


Commit: ebf173b9ce4305a373c0e24171ed7dec51093c5e
    https://github.com/scummvm/scummvm/commit/ebf173b9ce4305a373c0e24171ed7dec51093c5e
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-10-28T21:40:14+02:00

Commit Message:
SCI: Fix broken loop count check in checkAltInputs

Changed paths:
    engines/sci/parser/vocabulary.cpp



diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index a09ba8f..a0f9581 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -365,7 +365,7 @@ bool Vocabulary::checkAltInput(Common::String& text, uint16& cursorPos) {
 				}
 			}
 		}
-	} while (changed && loopCount < 10);
+	} while (changed && loopCount++ < 10);
 
 	return ret;
 }