[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.86,1.87 sound.cpp,1.124,1.125

Max Horn fingolfin at users.sourceforge.net
Sat May 24 17:05:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27171

Modified Files:
	resource.cpp sound.cpp 
Log Message:
cleanup

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- resource.cpp	24 May 2003 22:17:44 -0000	1.86
+++ resource.cpp	25 May 2003 00:04:16 -0000	1.87
@@ -1182,7 +1182,7 @@
 			// before the song end a jump to the song start. More precisely we abuse
 			// a S&M sysex, "maybe_jump" to achieve this effect. We could also
 			// use a set_loop sysex, but it's a bit longer, a little more complicated,
-			// and seemingly has no advantage either.
+			// and has no advantage either.
 
 			// First, find the track end
 			byte *end = ptr + size;
@@ -1192,15 +1192,14 @@
 			}
 			assert(ptr < end);
 
-			// Now insert the jump. The jump offset is measure in ticks, and 
+			// Now insert the jump. The jump offset is measured in ticks, and 
 			// each instrument definition spans 4 ticks... so we jump to tick
 			// 8*4, although jumping to tick 0 would probably work fine, too.
 			// Note: it's possible that some musics don't loop from the start...
 			// in that case we'll have to figure out how the loop range is specified
 			// and then how to handle it appropriately (if it's specified in
-			// ticks, we are fine; but if it's byte offset, we'll have to work
-			// a bit...).
-			int jump_offset = 8 * 4;
+			// ticks, we are fine; but if it's a byte offset, it'll be nasty).
+			const int jump_offset = 8 * 4;
 			memcpy(ptr, "\xf0\x13\x7d\x30\00", 5); ptr += 5;	// maybe_jump
 			memcpy(ptr, "\x00\x00", 2); ptr += 2;			// cmd -> 0 means always jump
 			memcpy(ptr, "\x00\x00\x00\x00", 4); ptr += 4;	// track -> there is only one track, 0

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- sound.cpp	24 May 2003 23:51:57 -0000	1.124
+++ sound.cpp	25 May 2003 00:04:16 -0000	1.125
@@ -328,10 +328,10 @@
 			83 84 86 88 89 8b 89 89  |........|
 			
 			As you can see, there are quite some patterns, e.g.
-			the 00 00 00 3c - the sound data seems to start at
+			the "3c 00 00 00" - the sound data seems to start at
 			offset 54 = 0x36, but it could also be 0x3c...
 			
-			Indy 3 seems to use a different format. The very first sound played
+			Indy 3 uses a different format. The very first sound played
 			in Indy 3 looks as follows:
 			5a 25 00 00 53 4f 54 25  |Z%..SOT%|
 			00 00 53 4f db 0a 00 00  |..SO....|





More information about the Scummvm-git-logs mailing list