[Scummvm-cvs-logs] CVS: scummvm insane.cpp,1.21,1.22 readme.txt,1.39,1.40 sound.cpp,1.66,1.67
James Brown
ender at users.sourceforge.net
Tue Apr 30 00:41:04 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv23582
Modified Files:
insane.cpp readme.txt sound.cpp
Log Message:
Added missing Dig smush codecs. Dig movies are now perfect, graphically.
Thanks Aquadran.
Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** insane.cpp 29 Apr 2002 08:31:45 -0000 1.21
--- insane.cpp 30 Apr 2002 07:40:56 -0000 1.22
***************
*** 225,228 ****
--- 225,229 ----
byte code, *tmp;
int i;
+ uint32 t;
if (pitch != 320) {
***************
*** 236,244 ****
code = *src++;
if (code == 0xFD) {
! // FIXME: Not implemented yet
src += 1;
dst += 4;
} else if (code == 0xFE) {
! // FIXME: Not implemented yet
src += 4;
dst += 4;
--- 237,261 ----
code = *src++;
if (code == 0xFD) {
! t = src[0];
! t += (t << 8) + (t << 16) + (t << 24);
! *(uint32 *)(dst + 0) = t;
! *(uint32 *)(dst + 320) = t;
! *(uint32 *)(dst + 320 * 2) = t;
! *(uint32 *)(dst + 320 * 3) = t;
src += 1;
dst += 4;
} else if (code == 0xFE) {
! t = src[0];
! t += (t << 8) + (t << 16) + (t << 24);
! *(uint32 *)(dst + 0) = t;
! t = src[1];
! t += (t << 8) + (t << 16) + (t << 24);
! *(uint32 *)(dst + 320) = t;
! t = src[2];
! t += (t << 8) + (t << 16) + (t << 24);
! *(uint32 *)(dst + 320 * 2) = t;
! t = src[3];
! t += (t << 8) + (t << 16) + (t << 24);
! *(uint32 *)(dst + 320 * 3) = t;
src += 4;
dst += 4;
Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/readme.txt,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** readme.txt 28 Apr 2002 08:59:33 -0000 1.39
--- readme.txt 30 Apr 2002 07:40:56 -0000 1.40
***************
*** 374,401 ****
--------
The core ScummVM team:
! Ludvig Strigeus - Original developer, lead developer 'simon' module
! Vincent Hamm - Current lead developer, ScummVM
! James Brown - Co-lead developer, ScummVM
! Jeremy Newman - Webmaster
Porters:
! Lionel Ulmer - X11/Linux port
! Nicolas Bacca - PocketPC/WinCE port
! Mutwin Kraus - Macintosh port
! Max Horn - Macintosh port
! Marcus Comstedt - DreamCast port
! Ruediger Hanke - MorphOS port
Contributors:
! Claudio Matsuoka - Daily builds (http://scummvm.sf.net/daily/)
! Janne Huttunen - Zak256/Indy256/LoomCD actor mask support
! Jeroen Janssen - Numerous readability and bugfix patches
! Gregory Montoir - AdvanceMAME Scale-2X implementation
! Mikesch Nepomuk - MI1 VGA Floppy patches.
! Edward Rudd - Fixes for playing MP3 versions of MI1/Loom Audio
! Daniel Schepler - Final MI1 CD music support
! Tim 'realmz' - Initial MI1 CD music support
! Jonathan 'khalek' - Expert weaver in the Loom
! Nicolas Noble - Config file support
And to all the contributors, users, and beta testers we've missed.
--- 374,402 ----
--------
The core ScummVM team:
! Ludvig Strigeus - Original developer, lead developer 'simon' module
! Vincent Hamm - Current lead developer, ScummVM
! James Brown - Co-lead developer, ScummVM
! Jeremy Newman - Webmaster
Porters:
! Lionel Ulmer - X11/Linux port
! Nicolas Bacca - PocketPC/WinCE port
! Mutwin Kraus - Macintosh port
! Max Horn - Macintosh port
! Marcus Comstedt - DreamCast port
! Ruediger Hanke - MorphOS port
Contributors:
! Claudio Matsuoka - Daily builds (http://scummvm.sf.net/daily/)
! Janne Huttunen - Zak256/Indy256/LoomCD actor mask support
! Jeroen Janssen - Numerous readability and bugfix patches
! Gregory Montoir - AdvanceMAME Scale-2X implementation
! Mikesch Nepomuk - MI1 VGA Floppy patches.
! Edward Rudd - Fixes for playing MP3 versions of MI1/Loom Audio
! Daniel Schepler - Final MI1 CD music support
! Tim 'realmz' - Initial MI1 CD music support
! Jonathan 'khalek' - Expert weaver in the Loom
! Nicolas Noble - Config file support
! Pawe3 Ko3odziejski - Added missing Dig SMUSH codecs
And to all the contributors, users, and beta testers we've missed.
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** sound.cpp 29 Apr 2002 10:42:53 -0000 1.66
--- sound.cpp 30 Apr 2002 07:40:56 -0000 1.67
***************
*** 681,685 ****
int i, z;
COMP_table table[50];
! unsigned char *CompInput, *CompOutput, *CompFinal;
int outputSize, finalSize;
--- 681,686 ----
int i, z;
COMP_table table[50];
! static unsigned char *CompInput, *CompOutput, *CompFinal;
! static bool initted;
int outputSize, finalSize;
***************
*** 703,707 ****
}
! CompFinal = (unsigned char *)alloc(1000000);
finalSize = 0;
--- 704,712 ----
}
! if (!initted) {
! CompFinal = (unsigned char *)alloc(1000000);
! initted = true;
! }
!
finalSize = 0;
***************
*** 756,764 ****
decompressed packet to the mixer.. but the packet
actually contains further subblocks! (eg, sync) */
! _mixer->play_raw(NULL, CompFinal, finalSize,22050, SoundMixer::FLAG_AUTOFREE|SoundMixer::FLAG_UNSIGNED);
}
void Scumm::playBundleSound(char *sound)
{
for (int i=0; i < num_sound_effects; i++) {
if (!scumm_stricmp(sound, bundle_table[i].filename)) {
--- 761,774 ----
decompressed packet to the mixer.. but the packet
actually contains further subblocks! (eg, sync) */
! _mixer->play_raw(NULL, CompFinal, finalSize,22050, SoundMixer::FLAG_UNSIGNED);
}
void Scumm::playBundleSound(char *sound)
{
+ if (!_sfxFile) {
+ warning("playBundleSound: SFX file is not open");
+ return;
+ }
+
for (int i=0; i < num_sound_effects; i++) {
if (!scumm_stricmp(sound, bundle_table[i].filename)) {
More information about the Scummvm-git-logs
mailing list