diff options
| author | Johannes Schickel | 2009-11-19 17:44:19 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-11-19 17:44:19 +0000 |
| commit | 2a4e630967036d5c308930609e06b86d24ab4158 (patch) | |
| tree | bd091359d3b649e5448c5eb215879bf19e0495e8 /engines/kyra/staticres.cpp | |
| parent | 95eef902d529e4a4df2ad141d492dc347040a0d0 (diff) | |
| download | scummvm-rg350-2a4e630967036d5c308930609e06b86d24ab4158.tar.gz scummvm-rg350-2a4e630967036d5c308930609e06b86d24ab4158.tar.bz2 scummvm-rg350-2a4e630967036d5c308930609e06b86d24ab4158.zip | |
Properly handle Kyra 2 Talkie demo in kyra.dat.
svn-id: r45990
Diffstat (limited to 'engines/kyra/staticres.cpp')
| -rw-r--r-- | engines/kyra/staticres.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 6f2e6e26e9..f10aea9741 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -45,7 +45,7 @@ namespace Kyra { -#define RESFILE_VERSION 61 +#define RESFILE_VERSION 62 namespace { bool checkKyraDat(Common::SeekableReadStream *file) { @@ -93,10 +93,8 @@ enum { #define LANGUAGE_FLAGS (GF_ENGLISH | GF_FRENCH | GF_GERMAN | GF_SPANISH | GF_ITALIAN | GF_JAPANESE | GF_LNGUNK) uint32 createFeatures(const GameFlags &flags) { - // special case for kyrandia 1 CD demo - if (flags.gameID == GI_KYRA1 && flags.isTalkie && flags.isDemo) + if (flags.isTalkie && flags.isDemo) return GF_TALKIE | GF_DEMO; - if (flags.isTalkie) return GF_TALKIE; if (flags.isDemo) @@ -1373,8 +1371,7 @@ const char *StaticResource::getFilename(const char *name) { else if (_vm->gameFlags().gameID == GI_LOL) filename += ".LOL"; - // Special case for Kyrandia 1 CD demo - if (_vm->gameFlags().gameID == GI_KYRA1 && _vm->gameFlags().isTalkie && _vm->gameFlags().isDemo) { + if (_vm->gameFlags().isTalkie && _vm->gameFlags().isDemo) { filename += ".CD.DEM"; return filename.c_str(); } |