diff options
author | Peter Kohaut | 2018-03-24 17:20:27 +0100 |
---|---|---|
committer | Peter Kohaut | 2018-03-24 17:28:34 +0100 |
commit | 5e9985bd6e4d136ec20e5e3be7589d34051227f1 (patch) | |
tree | e8b8f70ad0f509ec7b919c68c2f09bd2bbf0e8a1 /engines/bladerunner/audio_speech.cpp | |
parent | 2a646f8cc287a98f90e561ce8072c2af4322fd22 (diff) | |
download | scummvm-rg350-5e9985bd6e4d136ec20e5e3be7589d34051227f1.tar.gz scummvm-rg350-5e9985bd6e4d136ec20e5e3be7589d34051227f1.tar.bz2 scummvm-rg350-5e9985bd6e4d136ec20e5e3be7589d34051227f1.zip |
BLADERUNNER: Load game methods
save methods update
replaced few char* with Common::String
changed few pointers to references
Diffstat (limited to 'engines/bladerunner/audio_speech.cpp')
-rw-r--r-- | engines/bladerunner/audio_speech.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/bladerunner/audio_speech.cpp b/engines/bladerunner/audio_speech.cpp index 69883cbce2..87f73737d4 100644 --- a/engines/bladerunner/audio_speech.cpp +++ b/engines/bladerunner/audio_speech.cpp @@ -58,12 +58,12 @@ AudioSpeech::~AudioSpeech() { delete[] _data; } -bool AudioSpeech::playSpeech(const char *name, int pan) { +bool AudioSpeech::playSpeech(const Common::String &name, int pan) { // debug("AudioSpeech::playSpeech(\"%s\")", name); Common::ScopedPtr<Common::SeekableReadStream> r(_vm->getResourceStream(name)); if (!r) { - warning("AudioSpeech::playSpeech: AUD resource \"%s\" not found", name); + warning("AudioSpeech::playSpeech: AUD resource \"%s\" not found", name.c_str()); return false; } @@ -78,7 +78,7 @@ bool AudioSpeech::playSpeech(const char *name, int pan) { r->read(_data, r->size()); if (r->err()) { - warning("AudioSpeech::playSpeech: Error reading resource \"%s\"", name); + warning("AudioSpeech::playSpeech: Error reading resource \"%s\"", name.c_str()); return false; } @@ -117,7 +117,7 @@ bool AudioSpeech::isPlaying() const { bool AudioSpeech::playSpeechLine(int actorId, int sentenceId, int volume, int a4, int priority) { int balance = _vm->_actors[actorId]->soundBalance(); - Common::String name = Common::String::format("%02d-%04d%s.AUD", actorId, sentenceId, _vm->_languageCode); + Common::String name = Common::String::format("%02d-%04d%s.AUD", actorId, sentenceId, _vm->_languageCode.c_str()); return _vm->_audioPlayer->playAud(name, _speechVolume * volume / 100, balance, balance, priority, kAudioPlayerOverrideVolume); } |