[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.196,1.197 scumm.h,1.388,1.389
Jonathan Gray
khalek at users.sourceforge.net
Mon Mar 29 03:15:03 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27660
Modified Files:
resource.cpp scumm.h
Log Message:
clean up FMUS handling, fix not being able to enable sound debug messages
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- resource.cpp 28 Mar 2004 13:28:44 -0000 1.196
+++ resource.cpp 29 Mar 2004 11:02:45 -0000 1.197
@@ -781,7 +781,6 @@
// Used in 3DO version of puttputt joins the parade and probably others
// Specifies a separate file to be used for music from what I gather.
int tmpsize;
- int i = 0;
File dmuFile;
char buffer[128];
debugC(DEBUG_SOUND, "Found base tag FMUS in sound %d, size %d", idx, total_size);
@@ -796,10 +795,10 @@
tmpsize = _fileHandle.readUint32BE();
// SDAT contains name of file we want
- for (i = 0; (buffer[i] != ' ') && (i < tmpsize - 8) ; i++) {
- buffer[i] = _fileHandle.readByte();
- }
- buffer[tmpsize - 11] = '\0';
+ _fileHandle.read(buffer, tmpsize - 8);
+ // files seem to be 11 chars (8.3) unused space is replaced by spaces
+ *(strstr(buffer, " ")) = '\0';
+
debugC(DEBUG_SOUND, "FMUS file %s", buffer);
if (dmuFile.open(buffer, getGameDataPath()) == false) {
warning("Can't open music file %s*", buffer);
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -d -r1.388 -r1.389
--- scumm.h 28 Mar 2004 13:28:44 -0000 1.388
+++ scumm.h 29 Mar 2004 11:02:45 -0000 1.389
@@ -143,6 +143,7 @@
{"RESOURCE", "Track resource loading/management", DEBUG_RESOURCE},
{"VARS", "Track variable changes", DEBUG_VARS},
{"ACTORS", "Actor-related debug", DEBUG_ACTORS},
+ {"SOUND", "Sound related debug", DEBUG_SOUND},
{"INSANE", "Track INSANE", DEBUG_INSANE}
};
More information about the Scummvm-git-logs
mailing list