[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_music.cpp,1.23,1.24
Pawel Kolodziejski
aquadran at users.sourceforge.net
Thu Apr 8 15:13:04 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22694
Modified Files:
dimuse_music.cpp
Log Message:
fix for music code
Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dimuse_music.cpp 7 Apr 2004 17:49:22 -0000 1.23
+++ dimuse_music.cpp 8 Apr 2004 21:59:40 -0000 1.24
@@ -198,11 +198,10 @@
break;
case 3:
case 4:
- if ((!sequence) && (table->param != 0)) {
- if (table->param == _digStateMusicTable[_curMusicState].param) {
- startMusic(table->filename, table->soundId, 0, 127);
- return;
- }
+ if ((!sequence) && (table->param != 0) &&
+ (table->param == _digStateMusicTable[_curMusicState].param)) {
+ startMusic(table->filename, table->soundId, 0, 127);
+ return;
}
startMusic(table->filename, table->soundId, hookId, 127);
break;
@@ -330,10 +329,9 @@
case 4:
case 12:
fadeOutMusic(table->fadeOut60TicksDelay);
- if ((!sequence) && (table->param != 0)) {
- if (table->param == _comiStateMusicTable[_curMusicState].param) {
- startMusic(table->filename, table->soundId, 0, 127);
- }
+ if ((!sequence) && (table->param != 0) &&
+ (table->param == _comiStateMusicTable[_curMusicState].param)) {
+ startMusic(table->filename, table->soundId, 0, 127);
} else {
if (table->opcode == 12) {
startMusic(table->filename, table->soundId, table->hookId, 127);
More information about the Scummvm-git-logs
mailing list