diff options
| author | Sven Hesse | 2011-01-29 22:47:53 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-29 22:47:53 +0000 |
| commit | 65bc46d3ab7ba1102c46c475bb145a4c64403109 (patch) | |
| tree | a0e4c008684085ae6c93b7217d94e7fa110f09a4 /engines/gob/sound | |
| parent | 40bf0286a1054b09eeb95445499518f7c84aaa04 (diff) | |
| download | scummvm-rg350-65bc46d3ab7ba1102c46c475bb145a4c64403109.tar.gz scummvm-rg350-65bc46d3ab7ba1102c46c475bb145a4c64403109.tar.bz2 scummvm-rg350-65bc46d3ab7ba1102c46c475bb145a4c64403109.zip | |
GOB: Add Script::evalInt() and Script::evalString()
svn-id: r55634
Diffstat (limited to 'engines/gob/sound')
| -rw-r--r-- | engines/gob/sound/sound.cpp | 12 | ||||
| -rw-r--r-- | engines/gob/sound/sound.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp index 30bbb94fd4..219c6b84e8 100644 --- a/engines/gob/sound/sound.cpp +++ b/engines/gob/sound/sound.cpp @@ -508,11 +508,11 @@ void Sound::blasterWaitEndPlay(bool interruptible, bool stopComp) { _blaster->stopSound(0); } -void Sound::cdLoadLIC(const char *fname) { +void Sound::cdLoadLIC(const Common::String &fname) { if (!_cdrom) return; - debugC(1, kDebugSound, "CDROM: Loading LIC \"%s\"", fname); + debugC(1, kDebugSound, "CDROM: Loading LIC \"%s\"", fname.c_str()); Common::SeekableReadStream *stream = _vm->_dataIO->getFile(fname); if (!stream) @@ -592,17 +592,17 @@ void Sound::cdPlayMultMusic() { } } -void Sound::cdPlay(const char *trackName) { +void Sound::cdPlay(const Common::String &trackName) { if (!_cdrom) return; - debugC(1, kDebugSound, "CDROM: Playing track \"%s\"", trackName); + debugC(1, kDebugSound, "CDROM: Playing track \"%s\"", trackName.c_str()); // WORKAROUND - In Fascination CD, in the storage room, a track has the wrong // name in the scripts, and therefore doesn't play. This fixes the problem. - if ((_vm->getGameType() == kGameTypeFascination) && !scumm_stricmp(trackName, "boscle")) + if ((_vm->getGameType() == kGameTypeFascination) && trackName.equalsIgnoreCase("boscle")) _cdrom->startTrack("bosscle"); else - _cdrom->startTrack(trackName); + _cdrom->startTrack(trackName.c_str()); } void Sound::cdStop() { diff --git a/engines/gob/sound/sound.h b/engines/gob/sound/sound.h index 516fed5c78..24e161154b 100644 --- a/engines/gob/sound/sound.h +++ b/engines/gob/sound/sound.h @@ -114,13 +114,13 @@ public: // CD-ROM - void cdLoadLIC(const char *fname); + void cdLoadLIC(const Common::String &fname); void cdUnloadLIC(); void cdPlayBgMusic(); void cdPlayMultMusic(); - void cdPlay(const char *trackName); + void cdPlay(const Common::String &); void cdStop(); bool cdIsPlaying() const; |