[Scummvm-cvs-logs] SF.net SVN: scummvm: [20723] scummvm/trunk/engines/scumm/sound.cpp

[kirben at users.sourceforge.net]

Revision: 20723
Author:   kirben
Date:     2006-02-16 00:47:19 -0800 (Thu, 16 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20723&view=rev

Log Message:
-----------
Use simplier method of checking sound status in HE60/61 games

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/sound.cpp
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2006-02-16 08:39:17 UTC (rev 20722)
+++ scummvm/trunk/engines/scumm/sound.cpp	2006-02-16 08:47:19 UTC (rev 20723)
@@ -732,14 +732,9 @@
 		}
 	} else if (_vm->_heversion >= 60) {
 		if (sound == -2) {
-			return _vm->_mixer->getSoundID(_heSoundChannels[0]);
+			sound = _heChannel[0].sound;
 		} else if (sound == -1) {
-			if (_vm->_platform == Common::kPlatform3DO) {
-				return _vm->_mixer->isSoundIDActive(_currentMusic);
-			} else {
-				if (_vm->_imuse)
-					return _vm->_imuse->getSoundStatus(_currentMusic);
-			}
+			sound = _currentMusic;
 		}
 	}