[Scummvm-git-logs] scummvm master -> f2134a0dc264443c62b44a153629c83d60412a14

[sev-]

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

Summary:
6ad8df4873 SCUMM: Fix some class initializations
cead687df0 SCUMM: Fix CMS player initialization
92353cf88b SCUMM: Fix more initialization
f7a551dab2 SCUMM: Fix class initalization
f2134a0dc2 SCUMM: Fix IMUSE initialization


Commit: 6ad8df4873f284934ed1d583154ca378286f516d
    https://github.com/scummvm/scummvm/commit/6ad8df4873f284934ed1d583154ca378286f516d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-19T17:30:16+01:00

Commit Message:
SCUMM: Fix some class initializations

Changed paths:
    engines/scumm/smush/saud_channel.cpp
    engines/scumm/smush/smush_player.cpp



diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp
index ca64b38..7c41a87 100644
--- a/engines/scumm/smush/saud_channel.cpp
+++ b/engines/scumm/smush/saud_channel.cpp
@@ -34,7 +34,8 @@ SaudChannel::SaudChannel(int32 track) : SmushChannel(track),
 	_nbframes(0),
 	_markReached(false),
 	_index(0),
-	_keepSize(false) {
+	_keepSize(false),
+	_flags(0) {
 }
 
 bool SaudChannel::isTerminated() const {
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 42ee011..46f1447 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -73,7 +73,12 @@ public:
 
 	StringResource() :
 		_nbStrings(0),
-		_lastId(-1) {
+		_lastId(-1),
+		_lastString(NULL) {
+		for (int i = 0; i < MAX_STRINGS; i++) {
+			_strings[i].id = 0;
+			_strings[i].string = NULL;
+		}
 	}
 	~StringResource() {
 		for (int32 i = 0; i < _nbStrings; i++) {


Commit: cead687df076d8b3c0e1ba868e1014892d41ece3
    https://github.com/scummvm/scummvm/commit/cead687df076d8b3c0e1ba868e1014892d41ece3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-19T17:32:00+01:00

Commit Message:
SCUMM: Fix CMS player initialization

Changed paths:
    engines/scumm/players/player_v2cms.cpp



diff --git a/engines/scumm/players/player_v2cms.cpp b/engines/scumm/players/player_v2cms.cpp
index 1a1cd1e..94ba2cd 100644
--- a/engines/scumm/players/player_v2cms.cpp
+++ b/engines/scumm/players/player_v2cms.cpp
@@ -32,7 +32,8 @@ Player_V2CMS::Player_V2CMS(ScummEngine *scumm, Audio::Mixer *mixer)
 	  _cmsChips(), _midiDelay(0), _octaveMask(0), _looping(0), _tempo(0),
 	  _tempoSum(0), _midiData(0), _midiSongBegin(0), _musicTimer(0),
 	  _musicTimerTicks(0), _voiceTimer(0), _loadedMidiSong(0),
-	  _outputTableReady(0), _midiChannel(), _midiChannelUse() {
+	  _outputTableReady(0), _midiChannel(), _midiChannelUse(),
+	  _lastMidiCommand(0) {
 	setMusicVolume(255);
 
 	memset(_sfxFreq, 0xFF, sizeof(_sfxFreq));


Commit: 92353cf88b5705094947488b561d91cb1b41b8f1
    https://github.com/scummvm/scummvm/commit/92353cf88b5705094947488b561d91cb1b41b8f1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-19T17:33:45+01:00

Commit Message:
SCUMM: Fix more initialization

Changed paths:
    engines/scumm/players/player_v2base.cpp



diff --git a/engines/scumm/players/player_v2base.cpp b/engines/scumm/players/player_v2base.cpp
index b1872f3..8df4afc 100644
--- a/engines/scumm/players/player_v2base.cpp
+++ b/engines/scumm/players/player_v2base.cpp
@@ -331,6 +331,8 @@ Player_V2Base::Player_V2Base(ScummEngine *scumm, Audio::Mixer *mixer, bool pcjr)
 	_current_nr = _next_nr = 0;
 	_current_data = _next_data = 0;
 
+	_retaddr = 0;
+
 	// Initialize channel code
 	for (int i = 0; i < 4; ++i)
 		clear_channel(i);


Commit: f7a551dab2a481fad0b936fd778198bf5ab072fb
    https://github.com/scummvm/scummvm/commit/f7a551dab2a481fad0b936fd778198bf5ab072fb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-19T17:37:44+01:00

Commit Message:
SCUMM: Fix class initalization

Changed paths:
    engines/scumm/imuse/instrument.cpp



diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp
index 6cbe1a5..670b364 100644
--- a/engines/scumm/imuse/instrument.cpp
+++ b/engines/scumm/imuse/instrument.cpp
@@ -398,6 +398,7 @@ Instrument_Program::Instrument_Program(byte program, bool mt32) :
 
 Instrument_Program::Instrument_Program(Serializer *s) {
 	_program = 255;
+	_mt32 = false;
 	if (!s->isSaving())
 		saveOrLoad(s);
 }


Commit: f2134a0dc264443c62b44a153629c83d60412a14
    https://github.com/scummvm/scummvm/commit/f2134a0dc264443c62b44a153629c83d60412a14
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-19T17:39:43+01:00

Commit Message:
SCUMM: Fix IMUSE initialization

Changed paths:
    engines/scumm/imuse/imuse_player.cpp



diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index 6714cc0..33b38ee 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -81,7 +81,9 @@ Player::Player() :
 	_isMIDI(false),
 	_supportsPercussion(false),
 	_se(0),
-	_vol_chan(0) {
+	_vol_chan(0),
+	_abort(false),
+	_music_tick(0) {
 }
 
 Player::~Player() {