diff options
| author | Filippos Karapetis | 2014-07-20 16:04:43 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2014-07-20 17:10:55 +0300 |
| commit | b14a2599bcbb5fcec2e860e048081751dbde8162 (patch) | |
| tree | 9b4b98c54625f54b25000832156c54462ed5141f /engines/saga/music.cpp | |
| parent | 96dfeab1e5cb1b9e9dc5118f90b14bab241cce0d (diff) | |
| download | scummvm-rg350-b14a2599bcbb5fcec2e860e048081751dbde8162.tar.gz scummvm-rg350-b14a2599bcbb5fcec2e860e048081751dbde8162.tar.bz2 scummvm-rg350-b14a2599bcbb5fcec2e860e048081751dbde8162.zip | |
SAGA: Get rid of the MUSIC_DEFAULT flag
Diffstat (limited to 'engines/saga/music.cpp')
| -rw-r--r-- | engines/saga/music.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index e444900967..6e36f51dee 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -258,13 +258,8 @@ void Music::play(uint32 resourceId, MusicFlags flags) { int realTrackNumber; if (_vm->getGameId() == GID_ITE) { - if (flags == MUSIC_DEFAULT) { - if (resourceId == 13 || resourceId == 19) { - flags = MUSIC_NORMAL; - } else { - flags = MUSIC_LOOP; - } - } + if (flags == MUSIC_NORMAL && (resourceId == 13 || resourceId == 19)) + flags = MUSIC_LOOP; realTrackNumber = resourceId - 8; } else { realTrackNumber = resourceId + 1; @@ -359,9 +354,6 @@ void Music::play(uint32 resourceId, MusicFlags flags) { return; } - if (flags == MUSIC_DEFAULT) - flags = MUSIC_NORMAL; - // Load MIDI/XMI resource data if (_vm->getGameId() == GID_IHNM && _vm->isMacResources()) { // Load the external music file for Mac IHNM |