diff options
| author | Johannes Schickel | 2009-11-20 21:24:15 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-11-20 21:24:15 +0000 |
| commit | 90ba6a8c7a2d79bd91525262b1ca4af94ff1b37e (patch) | |
| tree | 024c7e53431da9604da7e26b5dc7eaf7f77dcb11 | |
| parent | f0aebf479f7bc1da6c51ab6e91611eaf341e2b00 (diff) | |
| download | scummvm-rg350-90ba6a8c7a2d79bd91525262b1ca4af94ff1b37e.tar.gz scummvm-rg350-90ba6a8c7a2d79bd91525262b1ca4af94ff1b37e.tar.bz2 scummvm-rg350-90ba6a8c7a2d79bd91525262b1ca4af94ff1b37e.zip | |
Flag Kyra3 as talkie version in kyra.dat.
svn-id: r46022
| -rw-r--r-- | dists/engine-data/kyra.dat | bin | 336871 -> 336898 bytes | |||
| -rw-r--r-- | engines/kyra/staticres.cpp | 4 | ||||
| -rw-r--r-- | tools/create_kyradat/create_kyradat.cpp | 4 | ||||
| -rw-r--r-- | tools/create_kyradat/games.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat Binary files differindex 1d5bdf6a4d..ed6cad0e9e 100644 --- a/dists/engine-data/kyra.dat +++ b/dists/engine-data/kyra.dat diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index aead2ff48e..22cc60c003 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -45,7 +45,7 @@ namespace Kyra { -#define RESFILE_VERSION 63 +#define RESFILE_VERSION 64 namespace { bool checkKyraDat(Common::SeekableReadStream *file) { @@ -1377,7 +1377,7 @@ const char *StaticResource::getFilename(const char *name) { return filename.c_str(); } - if (_vm->gameFlags().isTalkie && _vm->gameFlags().gameID != GI_KYRA3) + if (_vm->gameFlags().isTalkie) filename += ".CD"; else if (_vm->gameFlags().isDemo) filename += ".DEM"; diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index 549d4a1112..b49472eedc 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -40,7 +40,7 @@ #include <map> enum { - kKyraDatVersion = 63, + kKyraDatVersion = 64, kIndexSize = 12 }; @@ -372,7 +372,7 @@ enum { uint32 getFeatures(const Game *g) { uint32 features = 0; - if (g->special == kTalkieVersion || g->game == kKyra3) + if (g->special == kTalkieVersion) features |= GF_TALKIE; else if (g->special == kDemoVersion) features |= GF_DEMO; diff --git a/tools/create_kyradat/games.cpp b/tools/create_kyradat/games.cpp index 3f0bee628d..730245d5e0 100644 --- a/tools/create_kyradat/games.cpp +++ b/tools/create_kyradat/games.cpp @@ -87,7 +87,7 @@ const Game kyra2Games[] = { const Game kyra3Games[] = { // DOS CD (multi language version, with no language specific strings) - { kKyra3, UNK_LANG, kPlatformPC, -1, { "bf68701eb591d0b72219f314c0d32688", 0 } }, + { kKyra3, UNK_LANG, kPlatformPC, kTalkieVersion, { "bf68701eb591d0b72219f314c0d32688", 0 } }, GAME_DUMMY_ENTRY }; @@ -943,7 +943,7 @@ const GameNeed gameNeedTable[] = { { kLol, kPlatformPC, kDemoVersion, lolDemoNeed }, - { kKyra3, kPlatformPC, -1, kyra3Need }, + { kKyra3, kPlatformPC, kTalkieVersion, kyra3Need }, { kLol, kPlatformPC, -1, lolFloppyNeed }, { kLol, kPlatformPC98, -1, lolPC98Need }, |