diff options
author | Max Horn | 2010-01-22 23:58:24 +0000 |
---|---|---|
committer | Max Horn | 2010-01-22 23:58:24 +0000 |
commit | e270da88a68cc30ad6804eddb2d891fa80da47af (patch) | |
tree | 5221fda05138f53210efca0494f366937c4b6c3f /engines/agos/sound.cpp | |
parent | e754d8e1d3ae09cc5ab0915be2d656a927ac41a9 (diff) | |
download | scummvm-rg350-e270da88a68cc30ad6804eddb2d891fa80da47af.tar.gz scummvm-rg350-e270da88a68cc30ad6804eddb2d891fa80da47af.tar.bz2 scummvm-rg350-e270da88a68cc30ad6804eddb2d891fa80da47af.zip |
AGOS: cleanup
svn-id: r47451
Diffstat (limited to 'engines/agos/sound.cpp')
-rw-r--r-- | engines/agos/sound.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 6154a71618..37362a7986 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -574,7 +574,8 @@ void Sound::loadSfxFile(const GameSpecificSettings *gss) { } } -void Sound::readSfxFile(const char *filename) { +// This method is only used by Simon1 Amiga Talkie & Windows +void Sound::readSfxFile(const Common::String &filename) { if (_hasEffectsFile) return; @@ -584,7 +585,7 @@ void Sound::readSfxFile(const char *filename) { file->open(filename); if (file->isOpen() == false) { - error("readSfxFile: Can't load sfx file %s", filename); + error("readSfxFile: Can't load sfx file %s", filename.c_str()); } delete _effects; @@ -594,6 +595,7 @@ void Sound::readSfxFile(const char *filename) { _effects = new WavSound(_mixer, file); } +// This method is only used by Simon2 void Sound::loadSfxTable(File *gameFile, uint32 base) { stopAll(); @@ -606,14 +608,15 @@ void Sound::loadSfxTable(File *gameFile, uint32 base) { _effects = new VocSound(_mixer, gameFile, base); } -void Sound::readVoiceFile(const char *filename) { +// This method is only used by Simon1 Amiga Talkie +void Sound::readVoiceFile(const Common::String &filename) { _mixer->stopHandle(_voiceHandle); File *file = new File(); file->open(filename); if (file->isOpen() == false) - error("readVoiceFile: Can't load voice file %s", filename); + error("readVoiceFile: Can't load voice file %s", filename.c_str()); delete _voice; _voice = new RawSound(_mixer, file, 0, SOUND_BIG_ENDIAN); |