diff options
| author | Strangerke | 2013-06-26 23:11:34 +0200 |
|---|---|---|
| committer | Strangerke | 2013-06-26 23:11:34 +0200 |
| commit | 6e2d567bca53b6ffee771b4105e2e73dbd73f5b4 (patch) | |
| tree | 9880f0c496263ffb6928248d495ce4172dabed18 /engines/sword1/sound.h | |
| parent | ac387835e4527c1814919093b4e4bc9798d5742d (diff) | |
| parent | 6716fa39a6fb2a3925576288c256688c5aadd7e9 (diff) | |
| download | scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.gz scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.bz2 scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle
Conflicts:
engines/engines.mk
Diffstat (limited to 'engines/sword1/sound.h')
| -rw-r--r-- | engines/sword1/sound.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h index 4e1ac7ba34..b52d89f390 100644 --- a/engines/sword1/sound.h +++ b/engines/sword1/sound.h @@ -80,7 +80,7 @@ enum CowMode { class Sound { public: - Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan); + Sound(Audio::Mixer *mixer, ResMan *pResMan); ~Sound(); void setSpeechVol(uint8 volL, uint8 volR) { _speechVolL = volL; _speechVolR = volR; } void setSfxVol(uint8 volL, uint8 volR) { _sfxVolL = volL; _sfxVolR = volR; } @@ -125,7 +125,6 @@ private: Audio::Mixer *_mixer; ResMan *_resMan; bool _bigEndianSpeech; - char _filePath[100]; static const char _musicList[270]; static const uint16 _roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM]; static const FxDef _fxList[312]; |