aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/sound
diff options
context:
space:
mode:
authorSven Hesse2011-01-29 22:45:15 +0000
committerSven Hesse2011-01-29 22:45:15 +0000
commit0c3a33c354c027ee238186794d96c3047d0a4ce2 (patch)
treec6c0a8a7bb8e5e3973c53574a9b30efa6b3df337 /engines/gob/sound
parent05d5d64d6c108bcf57e67ff3976c1cd0324a30ef (diff)
downloadscummvm-rg350-0c3a33c354c027ee238186794d96c3047d0a4ce2.tar.gz
scummvm-rg350-0c3a33c354c027ee238186794d96c3047d0a4ce2.tar.bz2
scummvm-rg350-0c3a33c354c027ee238186794d96c3047d0a4ce2.zip
GOB: Change _curTotFile and _totToLoad into Common::String
svn-id: r55629
Diffstat (limited to 'engines/gob/sound')
-rw-r--r--engines/gob/sound/sound.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index dc80699ce0..02c3b28934 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -562,9 +562,9 @@ void Sound::cdPlayBgMusic() {
};
for (int i = 0; i < ARRAYSIZE(tracks); i++)
- if (!scumm_stricmp(_vm->_game->_curTotFile, tracks[i][0])) {
+ if (_vm->_game->_curTotFile.equalsIgnoreCase(tracks[i][0])) {
debugC(1, kDebugSound, "CDROM: Playing background music \"%s\" (\"%s\")",
- tracks[i][1], _vm->_game->_curTotFile);
+ tracks[i][1], _vm->_game->_curTotFile.c_str());
_cdrom->startTrack(tracks[i][1]);
break;
@@ -587,9 +587,9 @@ 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 (!scumm_stricmp(_vm->_game->_curTotFile, tracks[i][0])) {
+ if (_vm->_game->_curTotFile.equalsIgnoreCase(tracks[i][0])) {
debugC(1, kDebugSound, "CDROM: Playing mult music \"%s\" (\"%s\")",
- tracks[i][language + 1], _vm->_game->_curTotFile);
+ tracks[i][language + 1], _vm->_game->_curTotFile.c_str());
_cdrom->startTrack(tracks[i][language + 1]);
break;