[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.418,2.419 script_v80he.cpp,2.84,2.85 sound.cpp,1.434,1.435

[kirben]

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

Modified Files:
	intern.h script_v80he.cpp sound.cpp 
Log Message:

Muddled ifs


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.418
retrieving revision 2.419
diff -u -d -r2.418 -r2.419
--- intern.h	3 Apr 2005 23:53:33 -0000	2.418
+++ intern.h	4 Apr 2005 11:47:34 -0000	2.419
@@ -805,7 +805,7 @@
 	void o72_captureWizImage();
 	void o72_getTimer();
 	void o72_setTimer();
-	void o72_getSoundElapsedTimeOfSound();
+	void o72_getSoundElapsedTime();
 	void o72_startScript();
 	void o72_startObject();
 	void o72_drawObject();

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.84
retrieving revision 2.85
diff -u -d -r2.84 -r2.85
--- script_v80he.cpp	1 Apr 2005 08:51:12 -0000	2.84
+++ script_v80he.cpp	4 Apr 2005 11:47:37 -0000	2.85
@@ -153,7 +153,7 @@
 		/* 58 */
 		OPCODE(o72_getTimer),
 		OPCODE(o72_setTimer),
-		OPCODE(o72_getSoundElapsedTimeOfSound),
+		OPCODE(o72_getSoundElapsedTime),
 		OPCODE(o6_wordArrayDec),
 		/* 5C */
 		OPCODE(o6_if),

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -d -r1.434 -r1.435
--- sound.cpp	4 Apr 2005 11:41:16 -0000	1.434
+++ sound.cpp	4 Apr 2005 11:47:38 -0000	1.435
@@ -792,9 +792,9 @@
 void Sound::stopTalkSound() {
 	if (_sfxMode & 2) {
 		if (_vm->_imuseDigital) {
-			_vm->_mixer->stopID(kTalkSoundID);
+			_vm->_imuseDigital->stopSound(kTalkSoundID);
 		} else if (_vm->_heversion >= 70) {
-			_vm->_imuseDigital->stopSound(1);
+			_vm->_mixer->stopID(1);
 		} else {
 			_vm->_mixer->stopHandle(_talkChannelHandle);
 		}