[Scummvm-cvs-logs] SF.net SVN: scummvm: [31476] scummvm/trunk/engines/kyra/detection.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Apr 10 23:50:41 CEST 2008
Revision: 31476
http://scummvm.svn.sourceforge.net/scummvm/?rev=31476&view=rev
Author: lordhoto
Date: 2008-04-10 14:50:41 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
- Reverted r31454 changes to detection.cpp
- Added ADGF_CD to all CD versions
- Added ADGF_DROPLANGUAGE to Kyra2/3 CD version
- Changed Kyrandia engine to use agumented target ids
Modified Paths:
--------------
scummvm/trunk/engines/kyra/detection.cpp
Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp 2008-04-10 21:41:57 UTC (rev 31475)
+++ scummvm/trunk/engines/kyra/detection.cpp 2008-04-10 21:50:41 UTC (rev 31476)
@@ -245,7 +245,7 @@
AD_ENTRY1("GEMCUT.PAK", "fac399fe62f98671e56a005c5e94e39f"),
Common::EN_ANY,
Common::kPlatformPC,
- Common::ADGF_NO_FLAGS
+ Common::ADGF_CD
},
KYRA1_CD_FLAGS
},
@@ -256,7 +256,7 @@
AD_ENTRY1("GEMCUT.PAK", "230f54e6afc007ab4117159181a1c722"),
Common::DE_DEU,
Common::kPlatformPC,
- Common::ADGF_NO_FLAGS
+ Common::ADGF_CD
},
KYRA1_CD_FLAGS
},
@@ -267,7 +267,7 @@
AD_ENTRY1("GEMCUT.PAK", "b037c41768b652a040360ffa3556fd2a"),
Common::FR_FRA,
Common::kPlatformPC,
- Common::ADGF_NO_FLAGS
+ Common::ADGF_CD
},
KYRA1_CD_FLAGS
},
@@ -301,12 +301,34 @@
"kyra2",
"CD",
AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
- Common::UNK_LANG,
+ Common::EN_ANY,
Common::kPlatformPC,
- Common::ADGF_NO_FLAGS
+ Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
},
KYRA2_CD_FLAGS
},
+ {
+ {
+ "kyra2",
+ "CD",
+ AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
+ Common::DE_DEU,
+ Common::kPlatformPC,
+ Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+ },
+ KYRA2_CD_FLAGS
+ },
+ {
+ {
+ "kyra2",
+ "CD",
+ AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
+ Common::FR_FRA,
+ Common::kPlatformPC,
+ Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+ },
+ KYRA2_CD_FLAGS
+ },
{ // Interactive Demo
{
@@ -360,12 +382,34 @@
"kyra3",
0,
AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"),
- Common::UNK_LANG,
+ Common::EN_ANY,
Common::kPlatformPC,
- Common::ADGF_NO_FLAGS
+ Common::ADGF_DROPLANGUAGE
},
KYRA3_CD_FLAGS
},
+ {
+ {
+ "kyra3",
+ 0,
+ AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"),
+ Common::DE_DEU,
+ Common::kPlatformPC,
+ Common::ADGF_DROPLANGUAGE
+ },
+ KYRA3_CD_FLAGS
+ },
+ {
+ {
+ "kyra3",
+ 0,
+ AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"),
+ Common::FR_FRA,
+ Common::kPlatformPC,
+ Common::ADGF_DROPLANGUAGE
+ },
+ KYRA3_CD_FLAGS
+ },
{ AD_TABLE_END_MARKER, FLAGS(0, 0, 0, 0, 0) }
};
@@ -393,7 +437,7 @@
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagDontAugmentPreferredTarget
+ 0
};
} // End of anonymous namespace
@@ -436,9 +480,6 @@
flags.lang = Common::EN_ANY;
}
- if (flags.lang == Common::EN_USA || flags.lang == Common::EN_GRB)
- flags.lang = Common::EN_ANY;
-
switch (flags.gameID) {
case Kyra::GI_KYRA1:
*engine = new Kyra::KyraEngine_v1(syst, flags);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list