diff options
| author | Travis Howell | 2004-09-21 01:07:29 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-21 01:07:29 +0000 |
| commit | d7085acea18e9134da230e8223f529f7978fb3f9 (patch) | |
| tree | b6797d61a2d7dcb1239aa6d16e227b0b50cfa3fd | |
| parent | 860d1c67a0b23d7e160b5a337249316e3c097d7f (diff) | |
| download | scummvm-rg350-d7085acea18e9134da230e8223f529f7978fb3f9.tar.gz scummvm-rg350-d7085acea18e9134da230e8223f529f7978fb3f9.tar.bz2 scummvm-rg350-d7085acea18e9134da230e8223f529f7978fb3f9.zip | |
Switch order to prevent warning
svn-id: r15213
| -rw-r--r-- | scumm/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index b79ae052e7..77c595a42e 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -773,15 +773,15 @@ int Sound::isSoundRunning(int sound) const { } } + if (_vm->_mixer->isSoundIDActive(sound)) + return 1; + if (isSoundInQueue(sound)) return 1; if (!_vm->isResourceLoaded(rtSound, sound)) return 0; - if (_vm->_mixer->isSoundIDActive(sound)) - return 1; - if (_vm->_musicEngine) return _vm->_musicEngine->getSoundStatus(sound); |