diff options
author | Max Horn | 2004-06-27 22:14:35 +0000 |
---|---|---|
committer | Max Horn | 2004-06-27 22:14:35 +0000 |
commit | b8ad54b3af1de97bf986e7e4d4da97f02ece3273 (patch) | |
tree | 59bb3fbadaa8857a75010692593bef3a866d49cb /simon/sound.h | |
parent | a461c7550e2260601a63cd113a31254f2fd3ef50 (diff) | |
download | scummvm-rg350-b8ad54b3af1de97bf986e7e4d4da97f02ece3273.tar.gz scummvm-rg350-b8ad54b3af1de97bf986e7e4d4da97f02ece3273.tar.bz2 scummvm-rg350-b8ad54b3af1de97bf986e7e4d4da97f02ece3273.zip |
Reversed param order of File::open() -- this allowed me to get rid of a few more getGameDataPath() calls
svn-id: r14090
Diffstat (limited to 'simon/sound.h')
-rw-r--r-- | simon/sound.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/simon/sound.h b/simon/sound.h index 79ec0fa9e5..5ca7b2a028 100644 --- a/simon/sound.h +++ b/simon/sound.h @@ -31,7 +31,6 @@ class BaseSound; class Sound { private: byte _game; - const Common::String _gameDataPath; SoundMixer *_mixer; @@ -53,12 +52,12 @@ public: bool _voice_file; uint _ambient_playing; - Sound(const byte game, const GameSpecificSettings *gss, const Common::String &gameDataPath, SoundMixer *mixer); + Sound(const byte game, const GameSpecificSettings *gss, SoundMixer *mixer); ~Sound(); - void readSfxFile(const char *filename, const Common::String &gameDataPath); + void readSfxFile(const char *filename); void loadSfxTable(File *gameFile, uint32 base); - void readVoiceFile(const char *filename, const Common::String &gameDataPath); + void readVoiceFile(const char *filename); void playVoice(uint sound); void playEffects(uint sound); |