diff options
author | Paweł Kołodziejski | 2004-04-09 04:56:18 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2004-04-09 04:56:18 +0000 |
commit | d368d2e7fa03670c5f0a468caab1dda7da217ac2 (patch) | |
tree | 54babd3f3c3c4ae9402d9f3bf897121d38897b2c /scumm | |
parent | 5f89f5b2b756891d5f7a032b84a6bd89333056aa (diff) | |
download | scummvm-rg350-d368d2e7fa03670c5f0a468caab1dda7da217ac2.tar.gz scummvm-rg350-d368d2e7fa03670c5f0a468caab1dda7da217ac2.tar.bz2 scummvm-rg350-d368d2e7fa03670c5f0a468caab1dda7da217ac2.zip |
refreshScript was wrong used
svn-id: r13512
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/imuse_digi/dimuse.h | 1 | ||||
-rw-r--r-- | scumm/imuse_digi/dimuse_music.cpp | 14 | ||||
-rw-r--r-- | scumm/imuse_digi/dimuse_script.cpp | 2 | ||||
-rw-r--r-- | scumm/scumm.cpp | 2 |
4 files changed, 1 insertions, 18 deletions
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h index 61a4c8da4c..e888b6bfde 100644 --- a/scumm/imuse_digi/dimuse.h +++ b/scumm/imuse_digi/dimuse.h @@ -146,7 +146,6 @@ public: void stopAllSounds(bool waitForStop); void pause(bool pause); void parseScriptCmds(int a, int b, int c, int d, int e, int f, int g, int h); - void refreshScripts(); int getSoundStatus(int sound) const; int32 getCurMusicPosInMs(); int32 getCurVoiceLipSyncWidth(); diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp index da21f21301..c424001cbf 100644 --- a/scumm/imuse_digi/dimuse_music.cpp +++ b/scumm/imuse_digi/dimuse_music.cpp @@ -30,20 +30,6 @@ namespace Scumm { #define COMI_STATE_OFFSET 3 #define COMI_SEQ_OFFSET (COMI_STATE_OFFSET + 94) -void IMuseDigital::refreshScripts() { - Common::StackLock lock(_mutex, "IMuseDigital::refreshScripts()"); - bool found = false; - for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { - if ((_track[l].used) && (_track[l].volGroupId == IMUSE_VOLGRP_MUSIC) && (!_track[l].volFadeUsed)) { - found = true; - } - } - - if ((!found) && (_curMusicSeq != 0)) { - parseScriptCmds(0x2000, 0, 0, 0, 0, 0, 0, 0); - } -} - void IMuseDigital::setDigMusicState(int stateId) { int l, num = -1; diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp index 6d44b55796..63b2cf1fbc 100644 --- a/scumm/imuse_digi/dimuse_script.cpp +++ b/scumm/imuse_digi/dimuse_script.cpp @@ -155,7 +155,7 @@ void IMuseDigital::parseScriptCmds(int a, int b, int c, int d, int e, int f, int // setGroupMusicVolume(b); break; default: - warning("IMuseDigital::doCommand DEFAULT command %d", cmd); + error("IMuseDigital::doCommand DEFAULT command %d", cmd); } } diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index af8270aad8..8cfc17689a 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1577,8 +1577,6 @@ load_game: } _sound->processSoundQues(); - if ((_imuseDigital) && (_gameId != GID_FT)) - _imuseDigital->refreshScripts(); camera._last = camera._cur; |