[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.506,1.507
Max Horn
fingolfin at users.sourceforge.net
Sun Jan 29 09:48:03 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.676,1.677
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gob game.cpp,1.36,1.37 inter_v1.cpp,1.10,1.11 util.cpp,1.22,1.23 util.h,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11305
Modified Files:
sound.cpp
Log Message:
cleanup
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -d -r1.506 -r1.507
--- sound.cpp 27 Jan 2006 08:39:28 -0000 1.506
+++ sound.cpp 29 Jan 2006 17:47:38 -0000 1.507
@@ -2187,20 +2187,17 @@
// + some default instruments
byte *ptr;
if (_features & GF_OLD_BUNDLE) {
- ptr = (byte *) calloc(ad_size - 4, 1);
+ ad_size -= 4;
_fileHandle->seek(ad_offs + 4, SEEK_SET);
- _fileHandle->read(ptr, ad_size - 4);
- convertADResource(type, idx, ptr, ad_size - 4);
- free(ptr);
- return 1;
} else {
- ptr = (byte *) calloc(ad_size - 6, 1);
+ ad_size -= 6;
_fileHandle->seek(ad_offs, SEEK_SET);
- _fileHandle->read(ptr, ad_size - 6);
- convertADResource(type, idx, ptr, ad_size - 6);
- free(ptr);
- return 1;
}
+ ptr = (byte *) calloc(ad_size, 1);
+ _fileHandle->read(ptr, ad_size);
+ convertADResource(type, idx, ptr, ad_size);
+ free(ptr);
+ return 1;
} else if ((_musicType == MDT_PCSPK) && wa_offs != 0) {
if (_features & GF_OLD_BUNDLE) {
_fileHandle->seek(wa_offs, SEEK_SET);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.676,1.677
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gob game.cpp,1.36,1.37 inter_v1.cpp,1.10,1.11 util.cpp,1.22,1.23 util.h,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list