[Scummvm-git-logs] scummvm master -> 72dbfe953ca06ea084976015a186d7f4d12b0e51

[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:
541a7157f0 DIRECTOR: Fix copy/paste error
1d942944ee DIRECTOR: Lingo: Fix initialization
3b7819a97e DIRECTOR: Lingo: Attempt to fix func_cursor()
a5e998b75a DIRECTOR: Fix Sprite class constructors
72dbfe953c DIRECTOR: Initialize cast classes


Commit: 541a7157f0d21ac68784db2c436daacfd2c6fcb3
    https://github.com/scummvm/scummvm/commit/541a7157f0d21ac68784db2c436daacfd2c6fcb3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-16T09:05:50+01:00

Commit Message:
DIRECTOR: Fix copy/paste error

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index ae2eae8..8bb4e82 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -259,7 +259,7 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
 	}
 
 	Common::Array<uint16> sound = shardcst->getResourceIDList(MKTAG('S','N','D',' '));
-	if (stxt.size() != 0) {
+	if (sound.size() != 0) {
 		debugC(3, kDebugLoading, "Loading %d SNDs", sound.size());
 		for (Common::Array<uint16>::iterator iterator = sound.begin(); iterator != sound.end(); ++iterator) {
 			debugC(3, kDebugLoading, "Shared SND  %d", *iterator);


Commit: 1d942944ee7da353741141a7b224b71183885b7c
    https://github.com/scummvm/scummvm/commit/1d942944ee7da353741141a7b224b71183885b7c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-16T09:05:50+01:00

Commit Message:
DIRECTOR: Lingo: Fix initialization

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 1416b14..4a9b612 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -97,6 +97,7 @@ Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
 
 	_currentScript = 0;
 	_currentScriptType = kMovieScript;
+	_currentEntityId = 0;
 	_pc = 0;
 	_returning = false;
 	_indef = false;
@@ -112,6 +113,8 @@ Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
 	_floatPrecision = 4;
 	_floatPrecisionFormat = "%.4f";
 
+	_cursorOnStack = false;
+
 	_exitRepeat = false;
 
 	_localvars = NULL;


Commit: 3b7819a97e64257ed3d12529ae689f5312f5b197
    https://github.com/scummvm/scummvm/commit/3b7819a97e64257ed3d12529ae689f5312f5b197
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-16T09:05:50+01:00

Commit Message:
DIRECTOR: Lingo: Attempt to fix func_cursor()

Changed paths:
    engines/director/lingo/lingo-funcs.cpp


diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index d9e9ee4..70580b1 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -255,6 +255,8 @@ void Lingo::func_cursor(int c) {
 		break;
 	}
 
+	_cursorOnStack = true;
+
 	warning("STUB: func_cursor(%d)", c);
 }
 


Commit: a5e998b75ab61f2f5f830edf3b8dbaa28eef47ba
    https://github.com/scummvm/scummvm/commit/a5e998b75ab61f2f5f830edf3b8dbaa28eef47ba
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-16T09:05:50+01:00

Commit Message:
DIRECTOR: Fix Sprite class constructors

Changed paths:
    engines/director/sprite.cpp


diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 62897ed..0199667 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -56,6 +56,14 @@ Sprite::Sprite() {
 	_cast = nullptr;
 	_blend = 0;
 	_lineSize = 1;
+
+	_x1 = 0;
+	_x2 = 0;
+	_scriptId = 0;
+	_flags2 = 0;
+	_unk2 = 0;
+	_unk3 = 0;
+	_spriteType = 0;
 }
 
 Sprite::Sprite(const Sprite &sprite) {
@@ -88,6 +96,14 @@ Sprite::Sprite(const Sprite &sprite) {
 	_blend = sprite._blend;
 	_startTime = sprite._startTime;
 	_lineSize = sprite._lineSize;
+
+	_x1 = sprite._x1;
+	_x2 = sprite._x2;
+	_scriptId = sprite._scriptId;
+	_flags2 = sprite._flags2;
+	_unk2 = sprite._unk2;
+	_unk3 = sprite._unk3;
+	_spriteType = sprite._spriteType;
 }
 
 Sprite::~Sprite() {


Commit: 72dbfe953ca06ea084976015a186d7f4d12b0e51
    https://github.com/scummvm/scummvm/commit/72dbfe953ca06ea084976015a186d7f4d12b0e51
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-16T09:05:50+01:00

Commit Message:
DIRECTOR: Initialize cast classes

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 0db59cb..4522eae 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -44,13 +44,17 @@ BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint16 version) {
 		stream.readByte();
 		stream.readByte();
 
+		flags = 0;
+		someFlaggyThing = 0;
+		unk1 = unk2 = 0;
+
 		initialRect = Score::readRect(stream);
 		boundingRect = Score::readRect(stream);
 		regX = stream.readUint16();
 		regY = stream.readUint16();
 
 		bitsPerPixel = stream.readUint16();
-		if (bitsPerPixel == 0) 
+		if (bitsPerPixel == 0)
 			bitsPerPixel = 1;
 
 		int tail = 0;
@@ -66,6 +70,19 @@ BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint16 version) {
 }
 
 TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version) {
+	borderSize = kSizeNone;
+	gutterSize = kSizeNone;
+	boxShadow = kSizeNone;
+
+	flags1 = 0;
+	fontId = 0;
+	fontSize = 12;
+	textType = kTextTypeFixed;
+	textAlign = kTextAlignLeft;
+	textShadow = kSizeNone;
+	textSlant = 0;
+	palinfo1 = palinfo2 = palinfo3 = 0;
+
 	if (version < 4) {
 		flags1 = stream.readByte();
 		borderSize = static_cast<SizeType>(stream.readByte());
@@ -95,6 +112,7 @@ TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version) {
 		// TODO: FIXME: guesswork
 		fontId = stream.readByte();
 		fontSize = stream.readByte();
+		textSlant = 0;
 	} else if (version < 5) {
 		borderSize = static_cast<SizeType>(stream.readByte());
 		gutterSize = static_cast<SizeType>(stream.readByte());
@@ -117,6 +135,7 @@ TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version) {
 			warning("Unproxessed text cast flags: %x", flags);
 
 		fontSize = stream.readUint16();
+		textSlant = 0;
 	} else {
 		initialRect = Score::readRect(stream);
 		boundingRect = Score::readRect(stream);
@@ -143,6 +162,13 @@ ShapeCast::ShapeCast(Common::ReadStreamEndian &stream, uint16 version) {
 
 		initialRect = Score::readRect(stream);
 		boundingRect = Score::readRect(stream);
+
+		shapeType = kShapeRectangle;
+		pattern = 0;
+		fgCol = bgCol = 0;
+		fillType = 0;
+		lineThickness = 1;
+		lineDirection = 0;
 	}
 	modified = 0;
 }