[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_music.cpp,1.35,1.36
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Apr 3 10:12:12 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18430
Modified Files:
dimuse_music.cpp
Log Message:
revert last change, it's too much experimental
Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- dimuse_music.cpp 12 Mar 2005 18:54:06 -0000 1.35
+++ dimuse_music.cpp 3 Apr 2005 17:11:06 -0000 1.36
@@ -286,40 +286,27 @@
switch(table->opcode) {
case 0:
- fadeOutMusic(120);
- break;
case 8:
case 9:
- {
- int soundId = getCurMusicSoundId();
- setHookId(soundId, hookId);
- break;
- }
- case 1:
fadeOutMusic(120);
+ break;
+ case 1:
if (table->filename[0] == 0) {
+ fadeOutMusic(120);
return;
}
+ fadeOutMusic(120);
startMusic(table->filename, table->soundId, 0, 1);
setFade(table->soundId, 127, 120);
break;
case 2:
- {
- if (table->filename[0] == 0) {
- fadeOutMusic(60);
- return;
- }
- char *soundName = getCurMusicSoundName();
- if ((strcmp(soundName, table->filename) == 0)) {
- int soundId = getCurMusicSoundId();
- setFade(soundId, 127, table->fadeOut60TicksDelay);
- setHookId(soundId, hookId);
- } else {
- fadeOutMusic(120);
- startMusic(table->filename, table->soundId, table->hookId, 127);
- }
- break;
+ if (table->filename[0] == 0) {
+ fadeOutMusic(60);
+ return;
}
+ fadeOutMusic(table->fadeOut60TicksDelay);
+ startMusic(table->filename, table->soundId, table->hookId, 127);
+ break;
case 3:
case 4:
case 12:
@@ -327,9 +314,9 @@
fadeOutMusic(60);
return;
}
+ fadeOutMusic(table->fadeOut60TicksDelay);
if ((!sequence) && (table->atribPos != 0) &&
(table->atribPos == _comiStateMusicTable[_curMusicState].atribPos)) {
- fadeOutMusic(table->fadeOut60TicksDelay);
startMusic(table->filename, table->soundId, 0, 127);
return;
}
More information about the Scummvm-git-logs
mailing list