From 74c124628a223aeead189a623f3fbac75afda538 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 4 Apr 2005 11:47:38 +0000
Subject: Muddled ifs

svn-id: r17373
---
 scumm/intern.h         | 2 +-
 scumm/script_v80he.cpp | 2 +-
 scumm/sound.cpp        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scumm/intern.h b/scumm/intern.h
index c876e57443..672f35c078 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -805,7 +805,7 @@ protected:
 	void o72_captureWizImage();
 	void o72_getTimer();
 	void o72_setTimer();
-	void o72_getSoundElapsedTimeOfSound();
+	void o72_getSoundElapsedTime();
 	void o72_startScript();
 	void o72_startObject();
 	void o72_drawObject();
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 0e1949f74b..75554a0f80 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -153,7 +153,7 @@ void ScummEngine_v80he::setupOpcodes() {
 		/* 58 */
 		OPCODE(o72_getTimer),
 		OPCODE(o72_setTimer),
-		OPCODE(o72_getSoundElapsedTimeOfSound),
+		OPCODE(o72_getSoundElapsedTime),
 		OPCODE(o6_wordArrayDec),
 		/* 5C */
 		OPCODE(o6_if),
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index fae0cc596c..baedf5df3e 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -792,9 +792,9 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, SoundHandle *handl
 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);
 		}
-- 
cgit v1.2.3