[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.47,1.48 sound.h,1.12,1.13

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv26276/simon

Modified Files:
	sound.cpp sound.h 
Log Message:
some cleanup

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sound.cpp	3 Oct 2003 19:42:27 -0000	1.47
+++ sound.cpp	10 Oct 2003 13:55:07 -0000	1.48
@@ -235,11 +235,8 @@
 /******************************************************************************/
 
 
-SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const char *gameDataPath, SoundMixer *mixer) {
-	_game = game;
-	_gameDataPath = gameDataPath;
-	_mixer = mixer;
-	
+SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const Common::String &gameDataPath, SoundMixer *mixer)
+	: _game(game), _gameDataPath(gameDataPath), _mixer(mixer) {
 	_voice_index = 0;
 	_ambient_index = 0;
 
@@ -343,7 +340,7 @@
 	free(_offsets);
 }
 
-void SimonSound::readSfxFile(const char *filename, const char *gameDataPath) {
+void SimonSound::readSfxFile(const char *filename, const Common::String &gameDataPath) {
 	stopAll();
 
 	File *file = new File();
@@ -379,7 +376,7 @@
 		_effects = new VocSound(_mixer, gameFile, base);
 }
 
-void SimonSound::readVoiceFile(const char *filename, const char *gameDataPath) {
+void SimonSound::readVoiceFile(const char *filename, const Common::String &gameDataPath) {
 	stopAll();
 
 	File *file = new File();

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sound.h	3 Oct 2003 19:42:27 -0000	1.12
+++ sound.h	10 Oct 2003 13:55:07 -0000	1.13
@@ -22,6 +22,7 @@
 
 #include "sound/mixer.h"
 #include "simon/intern.h"
+#include "common/str.h"
 
 namespace Simon {
 
@@ -30,7 +31,7 @@
 class SimonSound {
 private:
 	byte _game;
-	const char *_gameDataPath;
+	const Common::String _gameDataPath;
 
 	SoundMixer *_mixer;
 
@@ -54,12 +55,12 @@
 	bool _voice_file;
 	uint _ambient_playing;
 
-	SimonSound(const byte game, const GameSpecificSettings *gss, const char *gameDataPath, SoundMixer *mixer);
+	SimonSound(const byte game, const GameSpecificSettings *gss, const Common::String &gameDataPath, SoundMixer *mixer);
 	~SimonSound();
 	
-	void readSfxFile(const char *filename, const char *gameDataPath);
+	void readSfxFile(const char *filename, const Common::String &gameDataPath);
 	void loadSfxTable(File *gameFile, uint32 base);
-	void readVoiceFile(const char *filename, const char *gameDataPath);
+	void readVoiceFile(const char *filename, const Common::String &gameDataPath);
 
 	void playVoice(uint sound);
 	void playEffects(uint sound);