diff options
author | Johannes Schickel | 2008-08-02 15:05:19 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-08-02 15:05:19 +0000 |
commit | 64fe71fed3df3d0a84fbbbc2b699f66fd266ccdd (patch) | |
tree | a802613f780bcebb5899b91cd261f009610cdb3e /engines/kyra/sound.cpp | |
parent | 6e9bbd734892a9ba25c8638f769e97ca0681d1ea (diff) | |
download | scummvm-rg350-64fe71fed3df3d0a84fbbbc2b699f66fd266ccdd.tar.gz scummvm-rg350-64fe71fed3df3d0a84fbbbc2b699f66fd266ccdd.tar.bz2 scummvm-rg350-64fe71fed3df3d0a84fbbbc2b699f66fd266ccdd.zip |
Added a member function loadSoundFile to Sound which accepts a filename string instead of a filename list id.
svn-id: r33527
Diffstat (limited to 'engines/kyra/sound.cpp')
-rw-r--r-- | engines/kyra/sound.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index ffe0cbf666..073639e4ca 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -328,7 +328,17 @@ struct DeleterArray { void SoundMidiPC::loadSoundFile(uint file) { Common::StackLock lock(_mutex); - Common::String filename = fileListEntry(file); + internalLoadFile(fileListEntry(file)); +} + +void SoundMidiPC::loadSoundFile(Common::String file) { + Common::StackLock lock(_mutex); + + internalLoadFile(file); +} + +void SoundMidiPC::internalLoadFile(Common::String file) { + Common::String filename = file; filename += "."; filename += _useC55 ? "C55" : "XMI"; |