diff options
| author | Paweł Kołodziejski | 2005-03-12 16:05:25 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2005-03-12 16:05:25 +0000 |
| commit | 03051c150189a22c58807090f3b0e77d64b4e6f7 (patch) | |
| tree | 0381fb65b6b262befe73e4503b450ef25c1d0808 /scumm | |
| parent | 1fde0d90f4d5ebc149584ad04513c9590db46b4d (diff) | |
| download | scummvm-rg350-03051c150189a22c58807090f3b0e77d64b4e6f7.tar.gz scummvm-rg350-03051c150189a22c58807090f3b0e77d64b4e6f7.tar.bz2 scummvm-rg350-03051c150189a22c58807090f3b0e77d64b4e6f7.zip | |
backport fix from residual imuse
svn-id: r17100
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi/dimuse_music.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp index 391fa76c6d..da57398353 100644 --- a/scumm/imuse_digi/dimuse_music.cpp +++ b/scumm/imuse_digi/dimuse_music.cpp @@ -157,12 +157,12 @@ void IMuseDigital::playDigMusic(const char *songName, const imuseDigTable *table atribPos = table->atribPos; hookId = _attributes[DIG_STATE_OFFSET + atribPos]; if (table->hookId != 0) { - if ((hookId != 0) && (table->hookId <= 1)) { + if ((hookId != 0) && (table->hookId > 1)) { + _attributes[DIG_STATE_OFFSET + atribPos] = 2; + } else { _attributes[DIG_STATE_OFFSET + atribPos] = hookId + 1; if (table->hookId < hookId + 1) _attributes[DIG_STATE_OFFSET + atribPos] = 1; - } else { - _attributes[DIG_STATE_OFFSET + atribPos] = 2; } } } @@ -274,12 +274,12 @@ void IMuseDigital::playComiMusic(const char *songName, const imuseComiTable *tab atribPos = table->atribPos; hookId = _attributes[COMI_STATE_OFFSET + atribPos]; if (table->hookId != 0) { - if ((hookId != 0) && (table->hookId <= 1)) { + if ((hookId != 0) && (table->hookId > 1)) { + _attributes[COMI_STATE_OFFSET + atribPos] = 2; + } else { _attributes[COMI_STATE_OFFSET + atribPos] = hookId + 1; if (table->hookId < hookId + 1) _attributes[COMI_STATE_OFFSET + atribPos] = 1; - } else { - _attributes[COMI_STATE_OFFSET + atribPos] = 2; } } } |