diff options
| author | Sven Hesse | 2011-01-29 22:45:51 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-29 22:45:51 +0000 |
| commit | ce3d4b5d1b06644a210fd7198373488ad4c8cdf4 (patch) | |
| tree | e358003d9216b4007e7fe69c08d7aba5d7f9e57d /engines/gob/sound/sound.cpp | |
| parent | 0c3a33c354c027ee238186794d96c3047d0a4ce2 (diff) | |
| download | scummvm-rg350-ce3d4b5d1b06644a210fd7198373488ad4c8cdf4.tar.gz scummvm-rg350-ce3d4b5d1b06644a210fd7198373488ad4c8cdf4.tar.bz2 scummvm-rg350-ce3d4b5d1b06644a210fd7198373488ad4c8cdf4.zip | |
GOB: Add GobEngine::isCurrentTot()
svn-id: r55630
Diffstat (limited to 'engines/gob/sound/sound.cpp')
| -rw-r--r-- | engines/gob/sound/sound.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp index 02c3b28934..30bbb94fd4 100644 --- a/engines/gob/sound/sound.cpp +++ b/engines/gob/sound/sound.cpp @@ -562,10 +562,8 @@ void Sound::cdPlayBgMusic() { }; for (int i = 0; i < ARRAYSIZE(tracks); i++) - if (_vm->_game->_curTotFile.equalsIgnoreCase(tracks[i][0])) { - debugC(1, kDebugSound, "CDROM: Playing background music \"%s\" (\"%s\")", - tracks[i][1], _vm->_game->_curTotFile.c_str()); - + if (_vm->isCurrentTot(tracks[i][0])) { + debugC(1, kDebugSound, "CDROM: Playing background music \"%s\" (\"%s\")", tracks[i][1], tracks[i][0]); _cdrom->startTrack(tracks[i][1]); break; } @@ -587,10 +585,8 @@ void Sound::cdPlayMultMusic() { // Default to "ang?" for other languages (including EN_USA) int language = _vm->_global->_language <= 4 ? _vm->_global->_language : 2; for (int i = 0; i < ARRAYSIZE(tracks); i++) - if (_vm->_game->_curTotFile.equalsIgnoreCase(tracks[i][0])) { - debugC(1, kDebugSound, "CDROM: Playing mult music \"%s\" (\"%s\")", - tracks[i][language + 1], _vm->_game->_curTotFile.c_str()); - + if (_vm->isCurrentTot(tracks[i][0])) { + debugC(1, kDebugSound, "CDROM: Playing mult music \"%s\" (\"%s\")", tracks[i][language + 1], tracks[i][0]); _cdrom->startTrack(tracks[i][language + 1]); break; } |