[Scummvm-cvs-logs] scummvm master -> 32c3de61e1614e61547a099e954f23093131f0e0

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2e7d06b670 SWORD1: Initialize class variables in constructor
32c3de61e1 SWORD1: Removed unused class variable


Commit: 2e7d06b67086be292c45901f5007d589e243d976
    https://github.com/scummvm/scummvm/commit/2e7d06b67086be292c45901f5007d589e243d976
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2013-05-14T13:51:25-07:00

Commit Message:
SWORD1: Initialize class variables in constructor

CID 1002998.

Changed paths:
    engines/sword1/animation.cpp



diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index ff3c897..206bd68 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -98,7 +98,7 @@ static const char *const sequenceListPSX[20] = {
 ///////////////////////////////////////////////////////////////////////////////
 
 MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, ResMan *resMan, OSystem *system, Video::VideoDecoder *decoder, DecoderType decoderType)
-	: _vm(vm), _textMan(textMan), _resMan(resMan), _system(system) {
+	: _vm(vm), _textMan(textMan), _resMan(resMan), _system(system), _textX(0), _textY(0), _textWidth(0), _textHeight(0), _textColor(1) {
 	_decoderType = decoderType;
 	_decoder = decoder;
 


Commit: 32c3de61e1614e61547a099e954f23093131f0e0
    https://github.com/scummvm/scummvm/commit/32c3de61e1614e61547a099e954f23093131f0e0
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2013-05-14T13:51:25-07:00

Commit Message:
SWORD1: Removed unused class variable

Changed paths:
    engines/sword1/sound.cpp
    engines/sword1/sound.h
    engines/sword1/sword1.cpp



diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 61bf525..268da74 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 4e1ac7b..b52d89f 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 fa593b8..2d54527 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);