diff options
author | Florian Kagerer | 2008-08-03 12:50:56 +0000 |
---|---|---|
committer | Florian Kagerer | 2008-08-03 12:50:56 +0000 |
commit | eec2a0137dff261e4a43d12eeb4cc1f0d1d66831 (patch) | |
tree | 7c5bf2cdf89e0e9a7b910c57eebaf66095ac73f1 | |
parent | 126d4a5ec64f091040c3bf3a8b5f9f17415dcd9f (diff) | |
download | scummvm-rg350-eec2a0137dff261e4a43d12eeb4cc1f0d1d66831.tar.gz scummvm-rg350-eec2a0137dff261e4a43d12eeb4cc1f0d1d66831.tar.bz2 scummvm-rg350-eec2a0137dff261e4a43d12eeb4cc1f0d1d66831.zip |
fix last commit (invalid kyra.dat game features for HOFCD)
svn-id: r33580
-rw-r--r-- | dists/engine-data/kyra.dat | bin | 240402 -> 240402 bytes | |||
-rw-r--r-- | engines/kyra/staticres.cpp | 2 | ||||
-rw-r--r-- | tools/create_kyradat/create_kyradat.cpp | 4 | ||||
-rw-r--r-- | tools/create_kyradat/hof_cd.h | 4 | ||||
-rw-r--r-- | tools/create_kyradat/misc.h | 11 |
5 files changed, 16 insertions, 5 deletions
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat Binary files differindex 3aab4e5aff..5cb5373f45 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 bb094af6c2..7d7f0cd4b8 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -43,7 +43,7 @@ namespace Kyra { -#define RESFILE_VERSION 30 +#define RESFILE_VERSION 31 bool StaticResource::checkKyraDat() { Common::File kyraDat; diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index 771d7a3265..78de2b6bce 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -31,7 +31,7 @@ #include "md5.h" enum { - kKyraDatVersion = 30, + kKyraDatVersion = 31, kIndexSize = 12 }; @@ -1070,7 +1070,7 @@ enum { uint32 getFeatures(const Game *g) { uint32 features = 0; - if (g->special == kTalkieVersion || g->special == k2CDFile1E || g->special == k2CDFile1F || g->special == k2CDFile1G || g->special == k2CDFile2E || g->special == k2CDFile2F || g->special == k2CDFile2G || g->game == kKyra3) + if (g->special == kTalkieVersion || g->special == k2CDFile1E || g->special == k2CDFile1F || g->special == k2CDFile1G || g->special == k2CDFile1I || g->special == k2CDFile2E || g->special == k2CDFile2F || g->special == k2CDFile2G || g->game == kKyra3) features |= GF_TALKIE; else if (g->special == kDemoVersion || g->special == k2DemoVersion || g->special == k2DemoLol) features |= GF_DEMO; diff --git a/tools/create_kyradat/hof_cd.h b/tools/create_kyradat/hof_cd.h index e60bffb253..2d77cd0c3b 100644 --- a/tools/create_kyradat/hof_cd.h +++ b/tools/create_kyradat/hof_cd.h @@ -58,4 +58,6 @@ const Game kyra2TalkieGames[] = { { kKyra2, IT_ITA, k2CDFile1I, "130795aa8f2333250c895dae9028b9bb", kyra2File1CDI}, GAME_DUMMY_ENTRY -};
\ No newline at end of file +}; + +/// debug\kyra_Towns debug\kyra_amiga_en debug\kyra_dos_CD_en debug\kyra_dos_CD_de debug\kyra_dos_CD_fr debug\kyra_dos_CD_ita debug\kyra_dos_Floppy_En debug\kyra_dos_Floppy_dE debug\kyra_dos_Floppy_fr debug\kyra_dos_floppy_ita debug\kyra_dos_Floppy_spa debug\kyra_dos_demo debug\hof_dos_floppy_De_1 debug\hof_dos_floppy_De_2 debug\hof_dos_floppy_En_1 debug\hof_dos_floppy_En_2 debug\hof_dos_floppy_Fr_1 debug\hof_dos_floppy_Fr_2 debug\hof_dos_CD_1 debug\hof_dos_CD_2 debug\hof_towns_1 debug\hof_towns_2 debug\hof_dos_demo debug\lol_dos_demo debug\hof_dos_CD_demo debug\mr_dos_cd
\ No newline at end of file diff --git a/tools/create_kyradat/misc.h b/tools/create_kyradat/misc.h index 83e4a6aac7..f0de5283ad 100644 --- a/tools/create_kyradat/misc.h +++ b/tools/create_kyradat/misc.h @@ -363,6 +363,7 @@ const int kyra2CDFile1EngNeed[] = { k2SeqplayCreditsSpecial, k2SeqplayStrings, k2SeqplaySfxFiles, + k2SeqplayTlkFiles, k2SeqplaySeqData, k2SeqplayIntroTracks, k2SeqplayFinaleTracks, @@ -371,11 +372,19 @@ const int kyra2CDFile1EngNeed[] = { const int kyra2CDFile1FreNeed[] = { k2SeqplayStrings, + k2SeqplayTlkFiles, -1 }; const int kyra2CDFile1GerNeed[] = { k2SeqplayStrings, + k2SeqplayTlkFiles, + -1 +}; + +const int kyra2CDFile1ItaNeed[] = { + k2SeqplayStrings, + k2SeqplayTlkFiles, -1 }; @@ -494,7 +503,7 @@ const GameNeed gameNeedTable[] = { { kKyra2, k2CDFile1E, kyra2CDFile1EngNeed }, { kKyra2, k2CDFile1F, kyra2CDFile1FreNeed }, { kKyra2, k2CDFile1G, kyra2CDFile1GerNeed }, - { kKyra2, k2CDFile1I, kyra2CDFile1EngNeed }, // Italian fan translation + { kKyra2, k2CDFile1I, kyra2CDFile1ItaNeed }, // Italian fan translation { kKyra2, k2CDFile2E, kyra2CDFile2EngNeed }, { kKyra2, k2CDFile2F, kyra2CDFile2FreNeed }, { kKyra2, k2CDFile2G, kyra2CDFile2GerNeed }, |