[Scummvm-cvs-logs] SF.net SVN: scummvm: [25416] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Feb 7 20:30:59 CET 2007
Revision: 25416
http://scummvm.svn.sourceforge.net/scummvm/?rev=25416&view=rev
Author: lordhoto
Date: 2007-02-07 11:30:49 -0800 (Wed, 07 Feb 2007)
Log Message:
-----------
Support for new kyra.dat, which includes static data from the fm-towns version.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/seqplayer.cpp
scummvm/trunk/engines/kyra/staticres.cpp
Modified: scummvm/trunk/engines/kyra/seqplayer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/seqplayer.cpp 2007-02-07 19:29:52 UTC (rev 25415)
+++ scummvm/trunk/engines/kyra/seqplayer.cpp 2007-02-07 19:30:49 UTC (rev 25416)
@@ -400,20 +400,11 @@
void SeqPlayer::s1_playTrack() {
uint8 msg = *_seqData++;
- // HACK: as long as we don't have extracted static data from the fm-towns
- // version in kyra.dat we use this to get music working
- if (_vm->gameFlags().platform == Common::kPlatformFMTowns) {
- if (msg <= 1)
- _vm->snd_playWanderScoreViaMap(msg, 0);
- else
- _vm->snd_playWanderScoreViaMap(msg+55, 0);
+ if (msg == 1) {
+ _sound->beginFadeOut();
} else {
- if (msg == 1) {
- _sound->beginFadeOut();
- } else {
- _sound->haltTrack();
- _sound->playTrack(msg);
- }
+ _sound->haltTrack();
+ _sound->playTrack(msg);
}
}
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2007-02-07 19:29:52 UTC (rev 25415)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2007-02-07 19:30:49 UTC (rev 25416)
@@ -31,7 +31,7 @@
namespace Kyra {
-#define RESFILE_VERSION 14
+#define RESFILE_VERSION 15
bool StaticResource::checkKyraDat() {
Common::File kyraDat;
@@ -74,7 +74,7 @@
GF_AMIGA = 1 << 17 // this is no special version flag yet!
};
-#define GAME_FLAGS (GF_FLOPPY | GF_TALKIE | GF_DEMO/* | GF_AUDIOCD*/)
+#define GAME_FLAGS (GF_FLOPPY | GF_TALKIE | GF_DEMO | GF_FMTOWNS)
#define LANGUAGE_FLAGS (GF_ENGLISH | GF_FRENCH | GF_GERMAN | GF_SPANISH | GF_ITALIAN | GF_JAPANESE | GF_LNGUNK)
uint32 createFeatures(const GameFlags &flags) {
@@ -82,8 +82,8 @@
return GF_TALKIE;
if (flags.isDemo)
return GF_DEMO;
- //if (flags.platform == Common::kPlatformFMTowns)
- // return GF_FMTOWNS;
+ if (flags.platform == Common::kPlatformFMTowns)
+ return GF_FMTOWNS;
return GF_FLOPPY;
}
@@ -98,6 +98,8 @@
return GF_SPANISH;
if (flags.lang == Common::IT_ITA)
return GF_ITALIAN;
+ if (flags.lang == Common::JA_JPN)
+ return GF_JAPANESE;
return GF_LNGUNK;
}
@@ -112,6 +114,7 @@
{ GF_GERMAN, "GER" },
{ GF_SPANISH, "SPA" },
{ GF_ITALIAN, "ITA" },
+ { GF_JAPANESE, "JPN" },
{ 0, 0 }
};
@@ -203,7 +206,7 @@
{ kPaletteList, kPaletteTable, "1 33 PALTABLE" },
// FM-TOWNS specific
- { kKyra1TownsSFXTable, kRawData, "SFXTABLE.TSX" },
+ { kKyra1TownsSFXTable, kRawData, "SFXTABLE" },
{ 0, 0, 0 }
};
@@ -607,9 +610,9 @@
ext = ".CD";
} else if (_engine->gameFlags().isDemo) {
ext = ".DEM";
- } /*else if (_engine->gameFlags().platform == Common::kPlatformFMTowns) {
+ } else if (_engine->gameFlags().platform == Common::kPlatformFMTowns) {
ext = ".TNS";
- } */
+ }
snprintf(buffer, 64, "%s%s", name, ext);
uint32 tempSize = 0;
uint8 *data = _engine->resource()->fileData(buffer, &tempSize);
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