[Scummvm-cvs-logs] SF.net SVN: scummvm:[33580] scummvm/trunk

[athrxx at users.sourceforge.net]

Revision: 33580
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33580&view=rev
Author:   athrxx
Date:     2008-08-03 12:50:56 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
fix last commit (invalid kyra.dat game features for HOFCD)

Modified Paths:
--------------
    scummvm/trunk/dists/engine-data/kyra.dat
    scummvm/trunk/engines/kyra/staticres.cpp
    scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
    scummvm/trunk/tools/create_kyradat/hof_cd.h
    scummvm/trunk/tools/create_kyradat/misc.h

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2008-08-03 12:16:53 UTC (rev 33579)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2008-08-03 12:50:56 UTC (rev 33580)
@@ -43,7 +43,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 30
+#define RESFILE_VERSION 31
 
 bool StaticResource::checkKyraDat() {
 	Common::File kyraDat;

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2008-08-03 12:16:53 UTC (rev 33579)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2008-08-03 12:50:56 UTC (rev 33580)
@@ -31,7 +31,7 @@
 #include "md5.h"
 
 enum {
-	kKyraDatVersion = 30,
+	kKyraDatVersion = 31,
 	kIndexSize = 12
 };
 
@@ -1070,7 +1070,7 @@
 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;

Modified: scummvm/trunk/tools/create_kyradat/hof_cd.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/hof_cd.h	2008-08-03 12:16:53 UTC (rev 33579)
+++ scummvm/trunk/tools/create_kyradat/hof_cd.h	2008-08-03 12:50:56 UTC (rev 33580)
@@ -58,4 +58,6 @@
 	{ 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

Modified: scummvm/trunk/tools/create_kyradat/misc.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/misc.h	2008-08-03 12:16:53 UTC (rev 33579)
+++ scummvm/trunk/tools/create_kyradat/misc.h	2008-08-03 12:50:56 UTC (rev 33580)
@@ -363,6 +363,7 @@
 	k2SeqplayCreditsSpecial,
 	k2SeqplayStrings,
 	k2SeqplaySfxFiles,
+	k2SeqplayTlkFiles,
 	k2SeqplaySeqData,
 	k2SeqplayIntroTracks,
 	k2SeqplayFinaleTracks,
@@ -371,14 +372,22 @@
 
 const int kyra2CDFile1FreNeed[] = {
 	k2SeqplayStrings,
+	k2SeqplayTlkFiles,
 	-1
 };
 
 const int kyra2CDFile1GerNeed[] = {
 	k2SeqplayStrings,
+	k2SeqplayTlkFiles,
 	-1
 };
 
+const int kyra2CDFile1ItaNeed[] = {
+	k2SeqplayStrings,
+	k2SeqplayTlkFiles,
+	-1
+};
+
 const int kyra2CDFile2EngNeed[] = {
 	k2IngameSfxFiles,
 	k2IngameSfxIndex,
@@ -494,7 +503,7 @@
 	{ 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 },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.