[Scummvm-cvs-logs] SF.net SVN: scummvm: [30538] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_music.cpp
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Thu Jan 17 22:46:18 CET 2008
Revision: 30538
http://scummvm.svn.sourceforge.net/scummvm/?rev=30538&view=rev
Author: aquadran
Date: 2008-01-17 13:46:17 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
reduction a bit of code
Modified Paths:
--------------
scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp 2008-01-17 21:35:31 UTC (rev 30537)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp 2008-01-17 21:46:17 UTC (rev 30538)
@@ -308,13 +308,6 @@
setHookIdForMusic(table->hookId);
break;
case 2:
- if (table->filename[0] == 0) {
- fadeOutMusic(60);
- return;
- }
- fadeOutMusic(table->fadeOutDelay);
- startMusic(table->filename, table->soundId, table->hookId, 127);
- break;
case 3:
case 4:
case 12:
@@ -324,6 +317,11 @@
}
if (table->transitionType == 4)
_stopingSequence = true;
+ if (table->transitionType == 2) {
+ fadeOutMusic(table->fadeOutDelay);
+ startMusic(table->filename, table->soundId, table->hookId, 127);
+ return;
+ }
if ((!sequence) && (table->attribPos != 0) &&
(table->attribPos == _comiStateMusicTable[_curMusicState].attribPos)) {
fadeOutMusicAndStartNew(table->fadeOutDelay, table->filename, table->soundId);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list