diff options
| author | Max Horn | 2011-06-01 15:58:19 +0200 | 
|---|---|---|
| committer | Max Horn | 2011-06-01 16:44:35 +0200 | 
| commit | 136ffb5e0a07daa7a091053e60b3c128201f7769 (patch) | |
| tree | a79156652b485a2e80ee44e9c431aac43f249f8b | |
| parent | 49a8f7675f9685df984f5acd88ea4ac56b703f33 (diff) | |
| download | scummvm-rg350-136ffb5e0a07daa7a091053e60b3c128201f7769.tar.gz scummvm-rg350-136ffb5e0a07daa7a091053e60b3c128201f7769.tar.bz2 scummvm-rg350-136ffb5e0a07daa7a091053e60b3c128201f7769.zip | |
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.
| -rw-r--r-- | engines/advancedDetector.cpp | 8 | ||||
| -rw-r--r-- | engines/advancedDetector.h | 5 | 
2 files changed, 3 insertions, 10 deletions
| diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index 6874806bc7..ece435af1c 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 6ee0822f47..408c46556d 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), | 
