[Scummvm-cvs-logs] CVS: scummvm/scumm scumm-md5.h,2.67,2.68 scumm.cpp,1.494,1.495 sound.cpp,1.454,1.455
kirben
kirben at users.sourceforge.net
Sun May 8 17:45:18 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1889/scumm
Modified Files:
scumm-md5.h scumm.cpp sound.cpp
Log Message:
Add a few more md5s
Set sfxMode mode for speech in HE games again.
Index: scumm-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm-md5.h,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -d -r2.67 -r2.68
--- scumm-md5.h 8 May 2005 22:10:06 -0000 2.67
+++ scumm-md5.h 9 May 2005 00:42:09 -0000 2.68
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Sun May 8 22:08:21 2005
+ This file was generated by the md5table tool on Mon May 09 00:40:32 2005
DO NOT EDIT MANUALLY!
*/
@@ -270,6 +270,7 @@
{ "b597e0403cc0002f69170e6caba7edd9", "indy3EGA", Common::EN_USA, Common::kPlatformPC },
{ "b628506f7def772e40de0aa5440fb8e1", "activity", Common::EN_USA, Common::kPlatformWindows },
{ "b886b0a5d909c7158a914e1d7c1c6c65", "loom", Common::FR_FRA, Common::kPlatformPC },
+ { "b8955d7d23b4972229060d1592489fef", "freddicove", Common::NL_NLD, Common::kPlatformWindows },
{ "bd126753de619a495f9f22adc951c8d5", "monkey2", Common::IT_ITA, Common::kPlatformPC },
{ "bf8b52fdd9a69c67f34e8e9fec72661c", "farmdemo", Common::EN_USA, Common::kPlatformWindows },
{ "bfdf584b01503f0762baded581f6a0a2", "SoccerMLS", Common::EN_USA, Common::kPlatformWindows },
@@ -280,6 +281,7 @@
{ "c3196c5349e53e387aaff1533d95e53a", "snmdemo", Common::EN_USA, Common::kPlatformPC },
{ "c3b22fa4654bb580b20325ebf4174841", "puttzoo", Common::NL_NLD, Common::kPlatformWindows },
{ "c3df37df9d3b481b45f75283a9907c47", "loom", Common::IT_ITA, Common::kPlatformPC },
+ { "c4787c3e8b5e2dfda90850ee800af00f ", "zal", Common::FR_FRA, Common::kPlatformPC },
{ "c4ffae9fac495475d6bc3343ccc8faf9", "Soccer2004", Common::EN_USA, Common::kPlatformUnknown },
{ "c5d10e190d4b4d59114b824f2fdbd00e", "loomTowns", Common::EN_USA, Common::kPlatformFMTowns },
{ "c63ee46143ba65f9ce14cf539ca51bd7", "atlantis", Common::EN_USA, Common::kPlatformPC },
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -d -r1.494 -r1.495
--- scumm.cpp 8 May 2005 22:10:07 -0000 1.494
+++ scumm.cpp 9 May 2005 00:42:10 -0000 1.495
@@ -442,6 +442,8 @@
{"ebd324dcf06a4c49e1ba5c231eee1060", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Updated Demo)", GID_HEGAME, 6, 99, 57, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformUnknown, 0, 0},
+ {"b8955d7d23b4972229060d1592489fef", "Freddi Fish 5: The Case of the Creature of Coral Cave (Updated)", GID_HEGAME, 6, 100, 61, MDT_NONE,
+ GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformUnknown, 0, 0}, // FreddiDZZ
{"4ce2d5b355964bbcb5e5ce73236ef868", "Freddi Fish 5: The Case of the Creature of Coral Cave (Updated Ru)", GID_HEGAME, 6, 100, 61, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformUnknown, 0, 0}, // FIXME: number of actors
{"21abe302e1b1e2b66d6f5c12e241ebfd", "Freddi Fish 5: The Case of the Creature of Coral Cave (Unencrypted)", GID_HEGAME, 6, 99, 61, MDT_NONE,
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -d -r1.454 -r1.455
--- sound.cpp 8 May 2005 14:38:56 -0000 1.454
+++ sound.cpp 9 May 2005 00:42:10 -0000 1.455
@@ -607,7 +607,7 @@
if (_vm->_imuseDigital) {
finished = !isSoundRunning(kTalkSoundID);
- } else if (_vm->_heversion >= 70) {
+ } else if (_vm->_heversion >= 60) {
finished = !isSoundRunning(1);
} else {
finished = !_vm->_mixer->isSoundHandleActive(_talkChannelHandle);
@@ -651,6 +651,7 @@
byte *ptr;
int32 size;
+ _sfxMode |= 2;
_vm->res.nukeResource(rtSound, 1);
_sfxFile->seek(offset + 4, SEEK_SET);
size = _sfxFile->readUint32BE() - 8;
More information about the Scummvm-git-logs
mailing list