[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.135,1.136 sound.cpp,1.366,1.367

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16772/scumm

Modified Files:
	scumm.cpp sound.cpp 
Log Message:

init var.
avoid valgrind warning


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- scumm.cpp	23 Aug 2004 10:52:10 -0000	1.135
+++ scumm.cpp	24 Aug 2004 00:58:27 -0000	1.136
@@ -638,6 +638,7 @@
 	_2byteFontPtr = 0;
 	_V1_talkingActor = 0;
 
+	_skipDrawObject = 0;
 	_heSndSoundId = 0;
 	_heSndOffset = 0;
 	_heSndTimer = 0;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- sound.cpp	22 Aug 2004 15:02:53 -0000	1.366
+++ sound.cpp	24 Aug 2004 00:58:28 -0000	1.367
@@ -162,10 +162,9 @@
 	byte flags = SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE;
 	bool music = false;
 	
-	debugC(DEBUG_SOUND, "playSound #%d (room %d)", soundID, 
-		_vm->getResourceRoomNr(rtSound, soundID));
-
 	if ((_vm->_heversion >= 70) && soundID >= 4000) {
+		debugC(DEBUG_SOUND, "playSound #%d", soundID);
+
 		int music_offs, total_size;
 		char buf[32];
 		File musicFile;
@@ -212,8 +211,12 @@
 			_vm->_mixer->playRaw(&_musicChannelHandle, sound, size, 11025, flags, soundID);
 			return;
 		}
-	} else 
+	} else {
+		debugC(DEBUG_SOUND, "playSound #%d (room %d)", soundID, 
+			_vm->getResourceRoomNr(rtSound, soundID));
+
 		ptr = _vm->getResourceAddress(rtSound, soundID);
+	}
 
 	if (!ptr) {
 		return;