[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.187,1.188 scumm.h,1.475,1.476

[Travis Howell]

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

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

Ooops


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- scumm.cpp	10 Sep 2004 10:38:56 -0000	1.187
+++ scumm.cpp	10 Sep 2004 10:45:22 -0000	1.188
@@ -680,7 +680,7 @@
 	_skipProcessActors = 0;
 	_heSndSoundId = 0;
 	_heSndOffset = 0;
-	_heSndTimer = 0;
+	_heSndChannel = 0;
 	_heSndLoop = 0;
 	_heSndSoundFreq = 0;
 	memset(_timers, 0, sizeof(_timers));
@@ -1417,7 +1417,7 @@
 	} else if (_version >= 7) {
 		VAR(VAR_V6_EMSSPACE) = 10000;
 		VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
-	} else if (_heversion >= 71) {
+	} else if (_heversion >= 70) {
 		VAR(VAR_NUM_SOUND_CHANNELS) = 3;
 		VAR(VAR_MUSIC_CHANNEL) = 1;
 		VAR(VAR_SOUND_CHANNEL) = 2;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -d -r1.475 -r1.476
--- scumm.h	10 Sep 2004 10:38:56 -0000	1.475
+++ scumm.h	10 Sep 2004 10:45:22 -0000	1.476
@@ -1052,7 +1052,7 @@
 	byte _proc_special_palette[256];
 	byte _roomPalette[256];
 	byte *_shadowPalette;
-	int _heSndSoundFreq, _heSndOffset, _heSndTimer, _heSndSoundId, _heSndLoop;
+	int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndLoop;
 	bool _skipDrawObject, _skipProcessActors;
 	int _timers[4];