[Scummvm-cvs-logs] SF.net SVN: scummvm:[45990] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Nov 19 18:44:19 CET 2009
Revision: 45990
http://scummvm.svn.sourceforge.net/scummvm/?rev=45990&view=rev
Author: lordhoto
Date: 2009-11-19 17:44:19 +0000 (Thu, 19 Nov 2009)
Log Message:
-----------
Properly handle Kyra 2 Talkie demo 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/create_kyradat.h
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-19 17:43:39 UTC (rev 45989)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-11-19 17:44:19 UTC (rev 45990)
@@ -45,7 +45,7 @@
namespace Kyra {
-#define RESFILE_VERSION 61
+#define RESFILE_VERSION 62
namespace {
bool checkKyraDat(Common::SeekableReadStream *file) {
@@ -93,10 +93,8 @@
#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 @@
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();
}
Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp 2009-11-19 17:43:39 UTC (rev 45989)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp 2009-11-19 17:44:19 UTC (rev 45990)
@@ -37,7 +37,7 @@
#include "md5.h"
enum {
- kKyraDatVersion = 61,
+ kKyraDatVersion = 62,
kIndexSize = 12
};
@@ -325,12 +325,13 @@
const SpecialExtension specialTable[] = {
{ kTalkieVersion, "CD" },
{ kDemoVersion, "DEM" },
- { kDemoCDVersion, "CD.DEM" },
+ { kTalkieDemoVersion, "CD.DEM" },
{ kTalkieFile1, "CD" },
{ kTalkieFile2, "CD" },
- { k2CDDemo, "CD" },
+ { kTalkieDemoFile1, "CD.DEM" },
+ { kTalkieDemoFile2, "CD.DEM" },
{ -1, 0 }
};
@@ -374,12 +375,11 @@
uint32 getFeatures(const Game *g) {
uint32 features = 0;
- if (g->special == kTalkieVersion || g->special == kTalkieFile1 || g->special == kTalkieFile2
- || g->special == k2CDDemo || g->game == kKyra3)
+ if (g->special == kTalkieVersion || g->special == kTalkieFile1 || g->special == kTalkieFile2 || g->game == kKyra3)
features |= GF_TALKIE;
else if (g->special == kDemoVersion)
features |= GF_DEMO;
- else if (g->special == kDemoCDVersion)
+ else if (g->special == kTalkieDemoVersion || g->special == kTalkieDemoFile1 || g->special == kTalkieDemoFile2)
features |= (GF_DEMO | GF_TALKIE);
else if (g->platform == kPlatformFMTowns || g->platform == kPlatformPC98) // HACK
features |= GF_FMTOWNS;
Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.h 2009-11-19 17:43:39 UTC (rev 45989)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.h 2009-11-19 17:44:19 UTC (rev 45990)
@@ -288,16 +288,15 @@
enum kSpecial {
kTalkieVersion = 0,
kDemoVersion,
+ kTalkieDemoVersion,
kFile1,
kFile2,
kTalkieFile1,
kTalkieFile2,
- k2CDDemo,
-
- // special case for Kyrandia 1 CD demo
- kDemoCDVersion
+ kTalkieDemoFile1,
+ kTalkieDemoFile2
};
struct SpecialExtension {
Modified: scummvm/trunk/tools/create_kyradat/games.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/games.cpp 2009-11-19 17:43:39 UTC (rev 45989)
+++ scummvm/trunk/tools/create_kyradat/games.cpp 2009-11-19 17:44:19 UTC (rev 45990)
@@ -29,7 +29,7 @@
const Game kyra1Games[] = {
// Demos
{ kKyra1, EN_ANY, kPlatformPC, kDemoVersion, "7b7504c8560ffc914d34c44c71b3094c" },
- { kKyra1, EN_ANY, kPlatformPC, kDemoCDVersion, "226fdba99cb11ef1047131d9a50e6292" },
+ { kKyra1, EN_ANY, kPlatformPC, kTalkieDemoVersion, "226fdba99cb11ef1047131d9a50e6292" },
// Amiga
{ kKyra1, EN_ANY, kPlatformAmiga, -1, "b620564b6b7e0787b053ca9e35bd9f52" },
@@ -61,10 +61,14 @@
const Game kyra2Games[] = {
// demos
{ kKyra2, EN_ANY, kPlatformPC, kDemoVersion, "a620a37579dd44ab0403482285e3897f" },
- { kKyra2, EN_ANY, kPlatformPC, k2CDDemo, "fa54d8abfe05f9186c05f7de7eaf1480" },
- { kKyra2, FR_FRA, kPlatformPC, k2CDDemo, "fa54d8abfe05f9186c05f7de7eaf1480" },
- { kKyra2, DE_DEU, kPlatformPC, k2CDDemo, "fa54d8abfe05f9186c05f7de7eaf1480" },
+ { kKyra2, EN_ANY, kPlatformPC, kTalkieDemoFile1, "85bbc1cc6c4cef6ad31fc6ee79518efb" },
+ { kKyra2, FR_FRA, kPlatformPC, kTalkieDemoFile1, "85bbc1cc6c4cef6ad31fc6ee79518efb" },
+ { kKyra2, DE_DEU, kPlatformPC, kTalkieDemoFile1, "85bbc1cc6c4cef6ad31fc6ee79518efb" },
+ { kKyra2, EN_ANY, kPlatformPC, kTalkieDemoFile2, "fa54d8abfe05f9186c05f7de7eaf1480" },
+ { kKyra2, FR_FRA, kPlatformPC, kTalkieDemoFile2, "fa54d8abfe05f9186c05f7de7eaf1480" },
+ { kKyra2, DE_DEU, kPlatformPC, kTalkieDemoFile2, "fa54d8abfe05f9186c05f7de7eaf1480" },
+
// floppy games
{ kKyra2, EN_ANY, kPlatformPC, kFile1, "9b0f5e57b5a2ed88b5b989cbb402b6c7" },
{ kKyra2, FR_FRA, kPlatformPC, kFile1, "df31cc9e37e1cf68df2fdc75ddf2d87b" },
@@ -954,7 +958,7 @@
{ kKyra1, kPlatformPC, kDemoVersion, kyra1DemoNeed },
- { kKyra1, kPlatformPC, kDemoCDVersion, kyra1DemoCDNeed },
+ { kKyra1, kPlatformPC, kTalkieDemoVersion, kyra1DemoCDNeed },
{ kKyra2, kPlatformPC, kFile1, kyra2FloppyFile1Need },
{ kKyra2, kPlatformPC, kFile2, kyra2FloppyFile2Need },
@@ -962,7 +966,8 @@
{ kKyra2, kPlatformPC, kTalkieFile1, kyra2CDFile1Need },
{ kKyra2, kPlatformPC, kTalkieFile2, kyra2CDFile2Need },
- { kKyra2, kPlatformPC, k2CDDemo, kyra2CDDemoNeed },
+ { kKyra2, kPlatformPC, kTalkieDemoFile1, kyra2CDFile1Need },
+ { kKyra2, kPlatformPC, kTalkieDemoFile2, kyra2CDDemoNeed },
{ kKyra2, kPlatformFMTowns, kFile1, kyra2TownsFile1Need },
{ kKyra2, kPlatformFMTowns, kFile2, kyra2TownsFile2Need },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list