[Scummvm-cvs-logs] scummvm master -> 29ed72115ef842247a8a0f4df571b216264312c8

[fingolfin]

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

Summary:
136ffb5e0a DETECTOR: Get rid of unused kADFlagDontAugmentPreferredTarget
48dac6ab7f DETECTOR: Clarify warning a bit
29ed72115e ANDROID: Revert stable-only changes from commit cf41ac0f which I accidentally merged


Commit: 136ffb5e0a07daa7a091053e60b3c128201f7769
    https://github.com/scummvm/scummvm/commit/136ffb5e0a07daa7a091053e60b3c128201f7769
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T07:44:35-07:00

Commit Message:
DETECTOR: Get rid of unused kADFlagDontAugmentPreferredTarget

It doesn't seem very useful to keep this around for future uses,
either, at least I couldn't think of a convincing argument.
If we really need something like this one day again, it is trivial
enough to add it back.

Changed paths:
    engines/advancedDetector.cpp
    engines/advancedDetector.h



diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 6874806..ece435a 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -196,12 +196,10 @@ static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *
 		desc["gameid"] = params.singleid;
 	}
 
-	if (!(params.flags & kADFlagDontAugmentPreferredTarget)) {
-		if (!desc.contains("preferredtarget"))
-			desc["preferredtarget"] = desc["gameid"];
+	if (!desc.contains("preferredtarget"))
+		desc["preferredtarget"] = desc["gameid"];
 
-		desc["preferredtarget"] = generatePreferredTarget(desc["preferredtarget"], realDesc);
-	}
+	desc["preferredtarget"] = generatePreferredTarget(desc["preferredtarget"], realDesc);
 
 	if (params.flags & kADFlagUseExtraAsHint)
 		desc["extra"] = realDesc->extra;
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 6ee0822..408c465 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -101,11 +101,6 @@ struct ADFileBasedFallback {
 
 enum ADFlags {
 	/**
-	 * Generate/augment preferred target with information on the language (if
-	 * not equal to english) and platform (if not equal to PC).
-	 */
-	kADFlagDontAugmentPreferredTarget = (1 << 0),
-	/**
 	 * Warn user about new variant if his version was detected with fallback
 	 */
 	kADFlagPrintWarningOnFileBasedFallback = (1 << 1),


Commit: 48dac6ab7fa306d7ff499340d5678d74900e6c26
    https://github.com/scummvm/scummvm/commit/48dac6ab7fa306d7ff499340d5678d74900e6c26
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T07:44:35-07:00

Commit Message:
DETECTOR: Clarify warning a bit

Changed paths:
    engines/advancedDetector.cpp



diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index ece435a..d093c95 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -224,7 +224,7 @@ bool cleanupPirated(ADGameDescList &matched) {
 		// We ruled out all variants and now have nothing
 		if (matched.empty()) {
 
-			warning("Illegitimate copy of the game detected. We give no support in such cases %d", matched.size());
+			warning("Illegitimate game copy detected. We give no support in such cases %d", matched.size());
 
 			return true;
 		}


Commit: 29ed72115ef842247a8a0f4df571b216264312c8
    https://github.com/scummvm/scummvm/commit/29ed72115ef842247a8a0f4df571b216264312c8
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T07:45:18-07:00

Commit Message:
ANDROID: Revert stable-only changes from commit cf41ac0f which I accidentally merged

Changed paths:
    backends/platform/android/jni.cpp



diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index b38dc51..c4daf24 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -602,12 +602,10 @@ void JNI::setPause(JNIEnv *env, jobject self, jboolean value) {
 
 		g_engine->pauseEngine(value);
 
-#if 0
 		if (value &&
 				g_engine->hasFeature(Engine::kSupportsSavingDuringRuntime) &&
 				g_engine->canSaveGameStateCurrently())
 			g_engine->saveGameState(0, "Android parachute");
-#endif
 	}
 
 	pause = value;