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

[lordhoto at users.sourceforge.net]

Revision: 46022
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46022&view=rev
Author:   lordhoto
Date:     2009-11-20 21:24:15 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Flag Kyra3 as talkie version in kyra.dat.

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/games.cpp

Modified: scummvm/trunk/dists/engine-data/kyra.dat
===================================================================
(Binary files differ)

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2009-11-20 21:23:39 UTC (rev 46021)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2009-11-20 21:24:15 UTC (rev 46022)
@@ -45,7 +45,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 63
+#define RESFILE_VERSION 64
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
@@ -1377,7 +1377,7 @@
 		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";

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-11-20 21:23:39 UTC (rev 46021)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-11-20 21:24:15 UTC (rev 46022)
@@ -40,7 +40,7 @@
 #include <map>
 
 enum {
-	kKyraDatVersion = 63,
+	kKyraDatVersion = 64,
 	kIndexSize = 12
 };
 
@@ -372,7 +372,7 @@
 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;

Modified: scummvm/trunk/tools/create_kyradat/games.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/games.cpp	2009-11-20 21:23:39 UTC (rev 46021)
+++ scummvm/trunk/tools/create_kyradat/games.cpp	2009-11-20 21:24:15 UTC (rev 46022)
@@ -87,7 +87,7 @@
 
 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 @@
 
 	{ kLol, kPlatformPC, kDemoVersion, lolDemoNeed },
 
-	{ kKyra3, kPlatformPC, -1, kyra3Need },
+	{ kKyra3, kPlatformPC, kTalkieVersion, kyra3Need },
 
 	{ kLol, kPlatformPC, -1, lolFloppyNeed },
 	{ kLol, kPlatformPC98, -1, lolPC98Need },


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