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

[djsrv]

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

Summary:
87fa731cac DIRECTOR: LINGO: Remove b_birth
3d36728754 DIRECTOR: Initialize channel _constraint
a3a6988178 DIRECTOR: LINGO: Fix reference->number conversion
e248e9590c DIRECTOR: LINGO: Enable sprite on property set


Commit: 87fa731cac3381c5dbdf6ae59c38edaec6c68483
    https://github.com/scummvm/scummvm/commit/87fa731cac3381c5dbdf6ae59c38edaec6c68483
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-19T16:47:15-04:00

Commit Message:
DIRECTOR: LINGO: Remove b_birth

Changed paths:
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/lingo-builtins.h


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 1d87176ccd..1a6771d19c 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -174,7 +174,6 @@ static struct BuiltinProto {
 	{ "voidP",			LB::b_voidP,		1, 1, true,  4, FBLTIN },	//			D4 f
 	// Misc
 	{ "alert",	 		LB::b_alert,		1, 1, false, 2, BLTIN },	// D2 c
-	{ "birth",	 		LB::b_birth,		-1,0, false, 4, FBLTIN },	//			D4 f
 	{ "clearGlobals",	LB::b_clearGlobals,	0, 0, false, 3, BLTIN },	//		D3.1 c
 	{ "cursor",	 		LB::b_cursor,		1, 1, false, 2, BLTIN },	// D2 c
 	{ "framesToHMS",	LB::b_framesToHMS,	4, 4, false, 3, FBLTIN },	//		D3 f
@@ -1391,14 +1390,6 @@ void LB::b_alert(int nargs) {
 	warning("STUB: b_alert(%s)", d.asString().c_str());
 }
 
-void LB::b_birth(int nargs) {
-	g_lingo->printSTUBWithArglist("b_birth", nargs);
-
-	g_lingo->dropStack(nargs);
-
-	g_lingo->push(Datum(0));
-}
-
 void LB::b_clearGlobals(int nargs) {
 	g_lingo->printSTUBWithArglist("b_clearGlobals", nargs);
 
diff --git a/engines/director/lingo/lingo-builtins.h b/engines/director/lingo/lingo-builtins.h
index 2e45aad618..b376453751 100644
--- a/engines/director/lingo/lingo-builtins.h
+++ b/engines/director/lingo/lingo-builtins.h
@@ -86,7 +86,6 @@ namespace LB {
 	void b_voidP(int nargs);
 
 	void b_alert(int nargs);
-	void b_birth(int nargs);
 	void b_clearGlobals(int nargs);
 	void b_cursor(int nargs);
 	void b_framesToHMS(int nargs);


Commit: 3d3672875449a0a35394ce9026e923af7d5fd411
    https://github.com/scummvm/scummvm/commit/3d3672875449a0a35394ce9026e923af7d5fd411
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-19T16:54:23-04:00

Commit Message:
DIRECTOR: Initialize channel _constraint

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 920d8e0c4e..c782e903ca 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -42,6 +42,7 @@ Channel::Channel(Sprite *sp) {
 	_sprite = sp;
 	_currentPoint = sp->_startPoint;
 	_delta = Common::Point(0, 0);
+	_constraint = 0;
 
 	_visible = true;
 


Commit: a3a6988178f311d1298ae46bf9f9cf693d52cb3c
    https://github.com/scummvm/scummvm/commit/a3a6988178f311d1298ae46bf9f9cf693d52cb3c
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-19T16:54:27-04:00

Commit Message:
DIRECTOR: LINGO: Fix reference->number conversion

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 70b600ee74..e31c9a5885 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -714,8 +714,6 @@ int Datum::asInt() {
 	int res = 0;
 
 	switch (type) {
-	case REFERENCE:
-		// fallthrough
 	case STRING:
 		{
 			Common::String src = asString();
@@ -732,6 +730,7 @@ int Datum::asInt() {
 		// no-op
 		break;
 	case INT:
+	case REFERENCE:
 		res = u.i;
 		break;
 	case FLOAT:
@@ -748,8 +747,6 @@ double Datum::asFloat() {
 	double res = 0.0;
 
 	switch (type) {
-	case REFERENCE:
-		// fallthrough
 	case STRING:
 		{
 			Common::String src = asString();
@@ -766,6 +763,7 @@ double Datum::asFloat() {
 		// no-op
 		break;
 	case INT:
+	case REFERENCE:
 		res = (double)u.i;
 		break;
 	case FLOAT:


Commit: e248e9590cbabd1b30e405b2c749a515d61d6f3a
    https://github.com/scummvm/scummvm/commit/e248e9590cbabd1b30e405b2c749a515d61d6f3a
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-19T16:54:28-04:00

Commit Message:
DIRECTOR: LINGO: Enable sprite on property set

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


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 96c80d860e..db1115d8db 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -820,6 +820,9 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 	if (!sprite)
 		return;
 
+	if (!sprite->_enabled)
+		sprite->_enabled = true;
+
 	switch (field) {
 	case kTheBackColor:
 		sprite->_backColor = d.asInt();