[Scummvm-git-logs] scummvm master -> 83c74d68a137081792aa7e68bb0501a86f1ea43e

[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:
a9566997aa SCUMM HE: More class initializations
3f2fce5691 SCUMM: Properly inint FM-TOWNS gfx code
cf5c6beb3a SCUMM: Set initial EOS state in Scumm::File class
0ebe534771 SCUMM: Fix dialog initialization
83c74d68a1 SCUMM HE: Fix crash in Moonbase distrotion


Commit: a9566997aaa873ed45fe79922640d449d3e9c81b
    https://github.com/scummvm/scummvm/commit/a9566997aaa873ed45fe79922640d449d3e9c81b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-27T14:02:52+01:00

Commit Message:
SCUMM HE: More class initializations

Changed paths:
    engines/scumm/he/sprite_he.cpp


diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index e3f04df..bef1c0b 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -38,7 +38,11 @@ Sprite::Sprite(ScummEngine_v90he *vm)
 	_vm(vm),
 	_spriteGroups(0),
 	_spriteTable(0),
-	_activeSpritesTable(0) {
+	_activeSpritesTable(0),
+	_numSpritesToProcess(0),
+	_varNumSpriteGroups(0),
+	_varNumSprites(0),
+	_varMaxSprites(0) {
 }
 
 Sprite::~Sprite() {


Commit: 3f2fce56913e1fb13e7c2709c55217e8ace26e2c
    https://github.com/scummvm/scummvm/commit/3f2fce56913e1fb13e7c2709c55217e8ace26e2c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-27T14:02:52+01:00

Commit Message:
SCUMM: Properly inint FM-TOWNS gfx code

Changed paths:
    engines/scumm/gfx_towns.cpp


diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp
index 6a558c9..166e55e 100644
--- a/engines/scumm/gfx_towns.cpp
+++ b/engines/scumm/gfx_towns.cpp
@@ -206,6 +206,8 @@ TownsScreen::TownsScreen(OSystem *system, int width, int height, Graphics::Pixel
 	memset(_outBuffer, 0, _pitch * _height);
 
 	setupLayer(0, width, height, 256);
+
+	_numDirtyRects = 0;
 }
 
 TownsScreen::~TownsScreen() {


Commit: cf5c6beb3a406383b401115222342b392262327a
    https://github.com/scummvm/scummvm/commit/cf5c6beb3a406383b401115222342b392262327a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-27T14:02:52+01:00

Commit Message:
SCUMM: Set initial EOS state in Scumm::File class

Changed paths:
    engines/scumm/file.cpp


diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 139f798..d4fc9be 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -33,7 +33,7 @@ namespace Scumm {
 #pragma mark --- ScummFile ---
 #pragma mark -
 
-ScummFile::ScummFile() : _subFileStart(0), _subFileLen(0) {
+ScummFile::ScummFile() : _subFileStart(0), _subFileLen(0), _myEos(false) {
 }
 
 void ScummFile::setSubfileRange(int32 start, int32 len) {


Commit: 0ebe5347710353bdfe5f764b54be7328371653ca
    https://github.com/scummvm/scummvm/commit/0ebe5347710353bdfe5f764b54be7328371653ca
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-27T14:02:52+01:00

Commit Message:
SCUMM: Fix dialog initialization

Changed paths:
    engines/scumm/dialogs.cpp


diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 9b09f42..8acb6eb 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -510,7 +510,7 @@ ValueDisplayDialog::ValueDisplayDialog(const Common::String& label, int minVal,
 		int val, uint16 incKey, uint16 decKey)
 	: GUI::Dialog(0, 0, 0, 0),
 	_label(label), _min(minVal), _max(maxVal),
-	_value(val), _incKey(incKey), _decKey(decKey) {
+	_value(val), _incKey(incKey), _decKey(decKey), _timer(0) {
 	assert(_min <= _value && _value <= _max);
 }
 
@@ -566,7 +566,7 @@ void ValueDisplayDialog::open() {
 }
 
 SubtitleSettingsDialog::SubtitleSettingsDialog(ScummEngine *scumm, int value)
-	: InfoDialog(scumm, ""), _value(value) {
+	: InfoDialog(scumm, ""), _value(value), _timer(0) {
 
 }
 


Commit: 83c74d68a137081792aa7e68bb0501a86f1ea43e
    https://github.com/scummvm/scummvm/commit/83c74d68a137081792aa7e68bb0501a86f1ea43e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-27T14:02:52+01:00

Commit Message:
SCUMM HE: Fix crash in Moonbase distrotion

Changed paths:
    engines/scumm/he/moonbase/distortion.cpp


diff --git a/engines/scumm/he/moonbase/distortion.cpp b/engines/scumm/he/moonbase/distortion.cpp
index 6b637d0..7aaec0e 100644
--- a/engines/scumm/he/moonbase/distortion.cpp
+++ b/engines/scumm/he/moonbase/distortion.cpp
@@ -44,11 +44,12 @@ static void blitDistortionCore(
 ) {
 	Common::Rect clipRect(dstBitmap->w, dstBitmap->h);
 
-	if (optionalclipRectPtr)
+	if (optionalclipRectPtr) {
 		if (!clipRect.intersects(*optionalclipRectPtr))
 			return;
 
-	clipRect.clip(*optionalclipRectPtr);
+			clipRect.clip(*optionalclipRectPtr);
+	}
 
 	Common::Rect distortionRect(distortionBitmap->w, distortionBitmap->h);
 	Common::Rect dstRect(x, y, x + distortionRect.width(), y + distortionRect.height());