[Scummvm-cvs-logs] scummvm master -> 0eb5a7f0b27cdf49c4815fb02b9ee76959154be8

[Strangerke]

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

Summary:
0eb5a7f0b2 MADS: Fix some more missing initializations


Commit: 0eb5a7f0b27cdf49c4815fb02b9ee76959154be8
    https://github.com/scummvm/scummvm/commit/0eb5a7f0b27cdf49c4815fb02b9ee76959154be8
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-28T07:19:18+02:00

Commit Message:
MADS: Fix some more missing initializations

Changed paths:
    engines/mads/nebular/sound_nebular.cpp
    engines/mads/player.cpp
    engines/mads/rails.cpp
    engines/mads/scene_data.cpp
    engines/mads/screen.cpp



diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index 577ed26..90f7cf0 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -185,6 +185,13 @@ ASound::ASound(Audio::Mixer *mixer, const Common::String &filename, int dataOffs
 	_samplesPerCallback = getRate() / CALLBACKS_PER_SECOND;
 	_samplesPerCallbackRemainder = getRate() % CALLBACKS_PER_SECOND;
 
+	for (int i = 0; i < 11; ++i) {
+		_channelData[i]._field0 = 0;
+		_channelData[i]._freqMask = 0;
+		_channelData[i]._freqBase = 0;
+		_channelData[i]._field6 = 0;
+	}
+
 	AdlibChannel::_channelsEnabled = false;
 
 	// Store passed parameters, and setup OPL
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index aaef9df..ed585cf 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -72,6 +72,14 @@ Player::Player(MADSEngine *vm)
 	_frameListIndex = 0;
 	_stopWalkerIndex = 0;
 	_totalDistance = 0;
+	_distAccum = 0;
+	_pixelAccum = 0;
+	_deltaDistance = 0;
+	_xDirection = 0;
+	_yDirection = 0;
+	_moving = false;
+	_walkOffScreen = 0;
+	_walkOffScreenSceneId = -1;
 
 	Common::fill(&_stopWalkerList[0], &_stopWalkerList[12], 0);
 	Common::fill(&_stopWalkerTrigger[0], &_stopWalkerTrigger[12], 0);
diff --git a/engines/mads/rails.cpp b/engines/mads/rails.cpp
index 7ae0d92..7f8a56d 100644
--- a/engines/mads/rails.cpp
+++ b/engines/mads/rails.cpp
@@ -43,6 +43,8 @@ void WalkNode::load(Common::SeekableReadStream *f) {
 Rails::Rails() {
 	_depthSurface = nullptr;
 	_routeLength = 0;
+	_depthStyle = 0;
+	_next = 0;
 }
 
 void Rails::load(const WalkNodeList &nodes, DepthSurface *depthSurface, int depthStyle) {
diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index 5656ac4..6697041 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -47,6 +47,7 @@ KernelMessage::KernelMessage() {
 	_actionDetails._verbId = VERB_NONE;
 	_actionDetails._objectNameId = 0;
 	_actionDetails._indirectObjectId = 0;
+	_textDisplayIndex = 0;
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index dacd20a..bcc41a1 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -247,6 +247,7 @@ ScreenObject::ScreenObject() {
 	_category = CAT_NONE;
 	_descId = 0;
 	_layer = 0;
+	_active = false;
 }
 
 /*------------------------------------------------------------------------*/