From 03051c150189a22c58807090f3b0e77d64b4e6f7 Mon Sep 17 00:00:00 2001 From: Paweł Kołodziejski Date: Sat, 12 Mar 2005 16:05:25 +0000 Subject: backport fix from residual imuse svn-id: r17100 --- scumm/imuse_digi/dimuse_music.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scumm/imuse_digi') 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; } } } -- cgit v1.2.3