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

[sev-]

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:
e40caf40a1 DIRECTOR: Fix object initialization


Commit: e40caf40a17e50d9cab698eb9b806302e106f179
    https://github.com/scummvm/scummvm/commit/e40caf40a17e50d9cab698eb9b806302e106f179
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-26T12:33:48+02:00

Commit Message:
DIRECTOR: Fix object initialization

Changed paths:
    engines/director/director.cpp
    engines/director/frame.cpp
    engines/director/lingo/lingo.cpp
    engines/director/score.cpp
    engines/director/sprite.cpp



diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 89bac29..cf66c85 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -55,6 +55,12 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 	_sharedSTXT = nullptr;
 	_sharedDIB = nullptr;
 
+	_currentScore = nullptr;
+	_soundManager = nullptr;
+	_currentPalette = nullptr;
+	_currentPaletteLength = 0;
+	_lingo = nullptr;
+
 	_mainArchive = nullptr;
 	_macBinary = nullptr;
 
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 987ceec..55d5ebd 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -51,6 +51,8 @@ Frame::Frame(DirectorEngine *vm) {
 	_skipFrameFlag = 0;
 	_blend = 0;
 
+	_palette = NULL;
+
 	_sprites.resize(CHANNEL_COUNT);
 
 	for (uint16 i = 0; i < _sprites.size(); i++) {
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 29e31c3..17e8ea4 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -108,6 +108,8 @@ Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
 
 	_exitRepeat = false;
 
+	_localvars = NULL;
+
 	warning("Lingo Inited");
 }
 
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c8e6697..c07804b 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -99,6 +99,15 @@ Score::Score(DirectorEngine *vm) {
 	_labels = NULL;
 	_font = NULL;
 
+	_versionMinor = _versionMajor = 0;
+	_currentFrameRate = 20;
+	_castArrayStart = _castArrayEnd = 0;
+	_currentFrame = 0;
+	_nextFrameTime = 0;
+	_flags = 0;
+	_stopPlay = false;
+	_stageColor = 0;
+
 	if (_movieArchive->hasResource(MKTAG('M','C','N','M'), 0)) {
 		_macName = _movieArchive->getName(MKTAG('M','C','N','M'), 0).c_str();
 	}
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 7fd5b3d..77d53ae 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -51,6 +51,10 @@ Sprite::Sprite() {
 	_volume = 0;
 	_stretch = 0;
 	_type = kInactiveSprite;
+
+	_cast = nullptr;
+	_blend = 0;
+	_lineSize = 1;
 }
 
 Sprite::Sprite(const Sprite &sprite) {
@@ -76,6 +80,13 @@ Sprite::Sprite(const Sprite &sprite) {
 	_volume = sprite._volume;
 	_stretch = sprite._stretch;
 	_type = sprite._type;
+
+	_cast = sprite._cast;
+	_constraint = sprite._constraint;
+	_moveable = sprite._moveable;
+	_blend = sprite._blend;
+	_startTime = sprite._startTime;
+	_lineSize = sprite._lineSize;
 }
 
 Sprite::~Sprite() {