diff options
| -rw-r--r-- | engines/sword1/sound.cpp | 3 | ||||
| -rw-r--r-- | engines/sword1/sound.h | 3 | ||||
| -rw-r--r-- | engines/sword1/sword1.cpp | 2 | 
3 files changed, 3 insertions, 5 deletions
| diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 61bf5257ab..268da74508 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -45,9 +45,8 @@ namespace Sword1 {  #define SOUND_SPEECH_ID 1  #define SPEECH_FLAGS (Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN) -Sound::Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan) +Sound::Sound(Audio::Mixer *mixer, ResMan *pResMan)  	: _rnd("sword1sound") { -	strcpy(_filePath, searchPath);  	_mixer = mixer;  	_resMan = pResMan;  	_bigEndianSpeech = false; 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]; diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index fa593b8df4..2d5452778d 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -104,7 +104,7 @@ Common::Error SwordEngine::init() {  	_mouse = new Mouse(_system, _resMan, _objectMan);  	_screen = new Screen(_system, _resMan, _objectMan);  	_music = new Music(_mixer); -	_sound = new Sound("", _mixer, _resMan); +	_sound = new Sound(_mixer, _resMan);  	_menu = new Menu(_screen, _mouse);  	_logic = new Logic(this, _objectMan, _resMan, _screen, _mouse, _sound, _music, _menu, _system, _mixer);  	_mouse->useLogicAndMenu(_logic, _menu); | 
