[Scummvm-cvs-logs] SF.net SVN: scummvm: [30477] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_music.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sun Jan 13 23:16:46 CET 2008
Revision: 30477
http://scummvm.svn.sourceforge.net/scummvm/?rev=30477&view=rev
Author: eriktorbjorn
Date: 2008-01-13 14:16:46 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
Indentation.
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-13 22:12:35 UTC (rev 30476)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp 2008-01-13 22:16:46 UTC (rev 30477)
@@ -171,29 +171,29 @@
fadeOutMusic(120);
switch (table->transitionType) {
- case 0:
- case 5:
- break;
- case 3:
- case 4:
- if (table->filename[0] == 0) {
- fadeOutMusic(60);
- return;
- }
- if (table->transitionType == 4)
- _stopingSequence = true;
- if ((!sequence) && (table->attribPos != 0) &&
- (table->attribPos == _digStateMusicTable[_curMusicState].attribPos)) {
- fadeOutMusic(108);
- startMusic(table->filename, table->soundId, 0, 127);
- } else {
- fadeOutMusic(108);
- startMusic(table->filename, table->soundId, hookId, 127);
- }
- break;
- case 6:
+ case 0:
+ case 5:
+ break;
+ case 3:
+ case 4:
+ if (table->filename[0] == 0) {
+ fadeOutMusic(60);
+ return;
+ }
+ if (table->transitionType == 4)
_stopingSequence = true;
- break;
+ if ((!sequence) && (table->attribPos != 0) &&
+ (table->attribPos == _digStateMusicTable[_curMusicState].attribPos)) {
+ fadeOutMusic(108);
+ startMusic(table->filename, table->soundId, 0, 127);
+ } else {
+ fadeOutMusic(108);
+ startMusic(table->filename, table->soundId, hookId, 127);
+ }
+ break;
+ case 6:
+ _stopingSequence = true;
+ break;
}
}
@@ -295,44 +295,44 @@
fadeOutMusic(120);
switch (table->transitionType) {
- case 0:
- break;
- case 8:
- setHookId(table->soundId, table->hookId);
- break;
- case 9:
+ case 0:
+ break;
+ case 8:
+ setHookId(table->soundId, table->hookId);
+ break;
+ case 9:
+ _stopingSequence = true;
+ setHookId(table->soundId, 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:
+ if (table->filename[0] == 0) {
+ fadeOutMusic(60);
+ return;
+ }
+ if (table->transitionType == 4)
_stopingSequence = true;
- setHookId(table->soundId, table->hookId);
- break;
- case 2:
- if (table->filename[0] == 0) {
- fadeOutMusic(60);
- return;
- }
+ if ((!sequence) && (table->attribPos != 0) &&
+ (table->attribPos == _comiStateMusicTable[_curMusicState].attribPos)) {
fadeOutMusic(table->fadeOutDelay);
+ startMusic(table->filename, table->soundId, 0, 127);
+ } else if (table->transitionType == 12) {
+ fadeOutMusic(table->fadeOutDelay);
startMusic(table->filename, table->soundId, table->hookId, 127);
- break;
- case 3:
- case 4:
- case 12:
- if (table->filename[0] == 0) {
- fadeOutMusic(60);
- return;
- }
- if (table->transitionType == 4)
- _stopingSequence = true;
- if ((!sequence) && (table->attribPos != 0) &&
- (table->attribPos == _comiStateMusicTable[_curMusicState].attribPos)) {
- fadeOutMusic(table->fadeOutDelay);
- startMusic(table->filename, table->soundId, 0, 127);
- } else if (table->transitionType == 12) {
- fadeOutMusic(table->fadeOutDelay);
- startMusic(table->filename, table->soundId, table->hookId, 127);
- } else {
- fadeOutMusic(table->fadeOutDelay);
- startMusic(table->filename, table->soundId, hookId, 127);
- }
- break;
+ } else {
+ fadeOutMusic(table->fadeOutDelay);
+ startMusic(table->filename, table->soundId, hookId, 127);
+ }
+ break;
}
}
@@ -423,19 +423,19 @@
fadeOutMusic(200);
switch (opcode) {
- case 0:
- case 4:
- break;
- case 1:
- case 2:
- case 3:
- {
- int soundId = getSoundIdByName(songName);
- if (soundId != -1) {
- startMusic(soundId, volume);
- }
+ case 0:
+ case 4:
+ break;
+ case 1:
+ case 2:
+ case 3:
+ {
+ int soundId = getSoundIdByName(songName);
+ if (soundId != -1) {
+ startMusic(soundId, volume);
}
- break;
+ }
+ break;
}
}
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