[Scummvm-git-logs] scummvm master -> 97a82f212b261fb6434210b2b105d9ab7b332f3b

[sev-]

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

Summary:
93be54f5f7 DIRECTOR: Init class variable
88a057d2ef DIRECTOR: Added sanity check to tests
4ccac49e08 DIRECTOR: Init TextCast fgcolor with something sane
105202f73c DIRECTOR: LINGO: Set initial prototype to null
0637c16f93 DIRECTOR: Initialize stage color
feffb0c99c DIRECTOR: Initialize variable. Oppsie
97a82f212b GRAPHICS: MACGUI: Initialize MacWidget colors to sane values


Commit: 93be54f5f77140fe474e83c5f427ab9fc48ebbf7
    https://github.com/scummvm/scummvm/commit/93be54f5f77140fe474e83c5f427ab9fc48ebbf7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-15T12:15:50+02:00

Commit Message:
DIRECTOR: Init class variable

Changed paths:
    engines/director/score.h


diff --git a/engines/director/score.h b/engines/director/score.h
index ca5abdaabf..f4a2480e99 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -83,6 +83,7 @@ struct TransParams {
 		type = kTransNone;
 		duration = 250;
 		chunkSize = 1;
+		area = 0;
 		steps = 0;
 		stepDuration = 0;
 		stripSize = 0;


Commit: 88a057d2efb6462b393d5e936f78500da37f5fae
    https://github.com/scummvm/scummvm/commit/88a057d2efb6462b393d5e936f78500da37f5fae
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-15T12:15:50+02:00

Commit Message:
DIRECTOR: Added sanity check to tests

Changed paths:
    engines/director/tests.cpp


diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index 0b352f5041..5f55c07c43 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -283,7 +283,9 @@ void DirectorEngine::runTests() {
 	Common::SeekableReadStream *stream = Common::wrapCompressedReadStream(movie);
 
 	_mainArchive = new RIFXArchive();
-	_mainArchive->openStream(stream, 0);
+	if (!_mainArchive->openStream(stream, 0)) {
+		error("DirectorEngine::runTests(): Bad movie data");
+	}
 	_currentScore = new Score(this);
 	_currentScore->setArchive(_mainArchive);
 	_currentScore->loadArchive(false);


Commit: 4ccac49e081ad6d315cd3d1b0b4141248626903f
    https://github.com/scummvm/scummvm/commit/4ccac49e081ad6d315cd3d1b0b4141248626903f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-15T12:15:50+02:00

Commit Message:
DIRECTOR: Init TextCast fgcolor with something sane

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index feb7957c6c..6f11e1b9cc 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -178,6 +178,7 @@ TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version, bool asButt
 	_textShadow = kSizeNone;
 	_textSlant = 0;
 	_bgpalinfo1 = _bgpalinfo2 = _bgpalinfo3 = 0;
+	_fgpalinfo1 = _fgpalinfo2 = _fgpalinfo3 = 0xff;
 
 	if (version <= 3) {
 		_flags = stream.readByte(); // region: 0 - auto, 1 - matte, 2 - disabled


Commit: 105202f73c8f418c43c879702ba2b0f89dbbf369
    https://github.com/scummvm/scummvm/commit/105202f73c8f418c43c879702ba2b0f89dbbf369
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-15T12:15:50+02:00

Commit Message:
DIRECTOR: LINGO: Set initial prototype to null

Changed paths:
    engines/director/lingo/lingo.h


diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index e19126dba4..489d1268b1 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -251,6 +251,8 @@ struct Object {
 		disposed = false;
 		inheritanceLevel = 1;
 		scriptContext = objContext;
+		prototype = nullptr;
+
 		if (objType == kFactoryObj) {
 			objArray = new Common::HashMap<uint32, Datum>;
 		} else {


Commit: 0637c16f93eb8ef4e2a434a7f1324851aba6610b
    https://github.com/scummvm/scummvm/commit/0637c16f93eb8ef4e2a434a7f1324851aba6610b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-15T12:15:50+02:00

Commit Message:
DIRECTOR: Initialize stage color

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index bbcf30d8bd..0c381b9fc1 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -85,6 +85,8 @@ Score::Score(DirectorEngine *vm) {
 	_framesRan = 0; // used by kDebugFewFramesOnly
 
 	_window = nullptr;
+
+	_stageColor = 0;
 }
 
 Score::~Score() {


Commit: feffb0c99c7b0582fd883a90ea480ece66d0364a
    https://github.com/scummvm/scummvm/commit/feffb0c99c7b0582fd883a90ea480ece66d0364a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-15T12:15:50+02:00

Commit Message:
DIRECTOR: Initialize variable. Oppsie

Changed paths:
    engines/director/sprite.cpp


diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index a1215d660d..3c236cf3f7 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -89,7 +89,7 @@ void Sprite::updateCast() {
 		_cast->createWidget();
 	}
 
-	int offsetx, offsety = 0;
+	int offsetx = 0, offsety = 0;
 	if (_cast->_type == kCastBitmap) {
 		BitmapCast *bc = (BitmapCast *)_cast;
 		offsety = bc->_initialRect.top - bc->_regY;


Commit: 97a82f212b261fb6434210b2b105d9ab7b332f3b
    https://github.com/scummvm/scummvm/commit/97a82f212b261fb6434210b2b105d9ab7b332f3b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-15T12:15:50+02:00

Commit Message:
GRAPHICS: MACGUI: Initialize MacWidget colors to sane values

Changed paths:
    graphics/macgui/macwidget.cpp


diff --git a/graphics/macgui/macwidget.cpp b/graphics/macgui/macwidget.cpp
index 9f7a00f1e1..b9769761f9 100644
--- a/graphics/macgui/macwidget.cpp
+++ b/graphics/macgui/macwidget.cpp
@@ -51,6 +51,9 @@ MacWidget::MacWidget(MacWidget *parent, int x, int y, int w, int h, bool focusab
 
 	_active = false;
 	_editable = false;
+
+	_fgcolor = 0xff;
+	_bgcolor = 0;
 }
 
 MacWidget::~MacWidget() {