[Scummvm-git-logs] scummvm master -> 8baaa873a14419861d0c8c007b62d549c5bbfeb3

sev- sev at scummvm.org
Fri Jan 24 23:03:58 UTC 2020


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:
86e4752da4 CREDITS: Add Scott Percival in a proper way
f1c3343772 DIRECTOR: LINGO: Implement referring cast members by their names
1596aeaa4e DIRECTOR: LINGO: Improve debug output
8baaa873a1 DIRECTOR: LINGO: Implement 'the number of cast <x>'


Commit: 86e4752da4d58d1804e6f7f4a82d11a60b2a49fe
    https://github.com/scummvm/scummvm/commit/86e4752da4d58d1804e6f7f4a82d11a60b2a49fe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-24T22:03:04+01:00

Commit Message:
CREDITS: Add Scott Percival in a proper way

Changed paths:
    devtools/credits.pl
    gui/credits.h


diff --git a/devtools/credits.pl b/devtools/credits.pl
index 8f97b12..5d18287 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -727,6 +727,7 @@ begin_credits("Credits");
 			begin_section("Director");
 				add_person("Eugene Sandulenko", "sev", "");
 				add_person("Dmitry Iskrich", "", "");
+				add_person("Scott Percival", "moralrecordings", "");
 				add_person("Steven Hoefel", "", "");
 				add_person("Tobia Tesan", "", "");
 			end_section();
diff --git a/gui/credits.h b/gui/credits.h
index c8cae04..613ce79 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -134,6 +134,7 @@ static const char *credits[] = {
 "C1""Director",
 "C0""Eugene Sandulenko",
 "C0""Dmitry Iskrich",
+"C0""Scott Percival",
 "C0""Steven Hoefel",
 "C0""Tobia Tesan",
 "",


Commit: f1c3343772d264fe124d9774c52ec49b481e00ce
    https://github.com/scummvm/scummvm/commit/f1c3343772d264fe124d9774c52ec49b481e00ce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-24T23:58:42+01:00

Commit Message:
DIRECTOR: LINGO: Implement referring cast members by their names

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 554e13a..2f5fb3d 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -701,6 +701,12 @@ Datum Lingo::getTheCast(Datum &id1, int field) {
 
 	if (id1.type == INT) {
 		id = id1.u.i;
+	} else if (id1.type == STRING) {
+		if (_vm->getCurrentScore()->_castsNames.contains(*id1.u.s)) {
+			id = _vm->getCurrentScore()->_castsNames[*id1.u.s];
+		} else {
+			warning("Lingo::getTheCast(): Unknown the cast \"%s\"", id1.u.s->c_str());
+		}
 	} else {
 		warning("Lingo::getTheCast(): Unknown the cast id type: %s", id1.type2str());
 		return d;


Commit: 1596aeaa4e1548c6f3e9967770a93565f3f0d129
    https://github.com/scummvm/scummvm/commit/1596aeaa4e1548c6f3e9967770a93565f3f0d129
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-25T00:00:58+01:00

Commit Message:
DIRECTOR: LINGO: Improve debug output

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 2f5fb3d..ead735d 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -428,7 +428,7 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.u.i = _vm->getCurrentScore()->_mouseIsDown;
 		break;
 	default:
-		warning("Lingo::getTheEntity(): Unprocessed getting field %s of entity %s", field2str(field), entity2str(entity));
+		warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
 		d.type = VOID;
 	}
 
@@ -458,7 +458,7 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 		setTheSprite(id, field, d);
 		break;
 	default:
-		warning("Lingo::setTheEntity(): Unprocessed setting field %s of entity %s", field2str(field), entity2str(entity));
+		warning("Lingo::setTheEntity(): Unprocessed setting field \"%s\" of entity %s", field2str(field), entity2str(entity));
 	}
 }
 
@@ -479,7 +479,7 @@ Datum Lingo::getTheSprite(Datum &id1, int field) {
 	}
 
 	if (!_vm->getCurrentScore()) {
-		warning("Lingo::getTheSprite(): The sprite %d field %s setting over non-active score", id, field2str(field));
+		warning("Lingo::getTheSprite(): The sprite %d field \"%s\" setting over non-active score", id, field2str(field));
 		return d;
 	}
 
@@ -575,7 +575,7 @@ Datum Lingo::getTheSprite(Datum &id1, int field) {
 		d.u.i = sprite->_width;
 		break;
 	default:
-		warning("Lingo::getTheSprite(): Unprocessed getting field %s of sprite", field2str(field));
+		warning("Lingo::getTheSprite(): Unprocessed getting field \"%s\" of sprite", field2str(field));
 		d.type = VOID;
 	}
 
@@ -595,7 +595,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 	d.toInt(); // Enforce Integer
 
 	if (!_vm->getCurrentScore()) {
-		warning("Lingo::setTheSprite(): The sprite %d field %s setting over non-active score", id, field2str(field));
+		warning("Lingo::setTheSprite(): The sprite %d field \"%s\" setting over non-active score", id, field2str(field));
 		return;
 	}
 
@@ -691,7 +691,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		sprite->_width = d.u.i;
 		break;
 	default:
-		warning("Lingo::setTheSprite(): Unprocessed setting field %s of sprite", field2str(field));
+		warning("Lingo::setTheSprite(): Unprocessed setting field \"%s\" of sprite", field2str(field));
 	}
 }
 
@@ -713,7 +713,7 @@ Datum Lingo::getTheCast(Datum &id1, int field) {
 	}
 
 	if (!_vm->getCurrentScore()) {
-		warning("Lingo::getTheCast(): The cast %d field %s setting over non-active score", id, field2str(field));
+		warning("Lingo::getTheCast(): The cast %d field \"%s\" setting over non-active score", id, field2str(field));
 		return d;
 	}
 
@@ -737,7 +737,7 @@ Datum Lingo::getTheCast(Datum &id1, int field) {
 	case kTheBackColor:
 		{
 			if (castType != kCastShape) {
-				warning("Lingo::getTheCast(): Field %s of cast %d not found", field2str(field), id);
+				warning("Lingo::getTheCast(): Field \"%s\" of cast %d not found", field2str(field), id);
 				d.type = VOID;
 				return d;
 			}
@@ -756,7 +756,7 @@ Datum Lingo::getTheCast(Datum &id1, int field) {
 	case kTheForeColor:
 		{
 			if (castType != kCastShape) {
-				warning("Lingo::getTheCast(): Field %s of cast %d not found", field2str(field), id);
+				warning("Lingo::getTheCast(): Field \"%s\" of cast %d not found", field2str(field), id);
 				d.type = VOID;
 				return d;
 			}
@@ -783,7 +783,7 @@ Datum Lingo::getTheCast(Datum &id1, int field) {
 		d.u.i = _vm->getCurrentScore()->getCastMemberInitialRect(id).width();
 		break;
 	default:
-		warning("Lingo::getTheCast(): Unprocessed getting field %s of cast %d", field2str(field), id);
+		warning("Lingo::getTheCast(): Unprocessed getting field \"%s\" of cast %d", field2str(field), id);
 		d.type = VOID;
 	//TODO find out about String fields
 	}
@@ -796,7 +796,7 @@ void Lingo::setTheCast(Datum &id1, int field, Datum &d) {
 	Score *score = _vm->getCurrentScore();
 
 	if (!score) {
-		warning("Lingo::setTheCast(): The cast %d field %s setting over non-active score", id, field2str(field));
+		warning("Lingo::setTheCast(): The cast %d field \"%s\" setting over non-active score", id, field2str(field));
 		return;
 	}
 
@@ -814,7 +814,7 @@ void Lingo::setTheCast(Datum &id1, int field, Datum &d) {
 	case kTheBackColor:
 		{
 			if (castType != kCastShape) {
-				warning("Lingo::setTheCast(): Field %s of cast %d not found", field2str(field), id);
+				warning("Lingo::setTheCast(): Field \"%s\" of cast %d not found", field2str(field), id);
 			}
 			ShapeCast *shape = (ShapeCast *)score->_loadedCast->getVal(id);
 
@@ -840,7 +840,7 @@ void Lingo::setTheCast(Datum &id1, int field, Datum &d) {
 	case kTheForeColor:
 		{
 			if (castType != kCastShape) {
-				warning("Lingo::setTheCast(): Field %s of cast %d not found", field2str(field), id);
+				warning("Lingo::setTheCast(): Field \"%s\" of cast %d not found", field2str(field), id);
 				return;
 			}
 			ShapeCast *shape = (ShapeCast *)score->_loadedCast->getVal(id);
@@ -888,7 +888,7 @@ void Lingo::setTheCast(Datum &id1, int field, Datum &d) {
 		score->setCastMemberModified(id);
 		break;
 	default:
-		warning("Lingo::setTheCast(): Unprocessed setting field %s of cast %d", field2str(field), id);
+		warning("Lingo::setTheCast(): Unprocessed setting field \"%s\" of cast %d", field2str(field), id);
 	}
 }
 


Commit: 8baaa873a14419861d0c8c007b62d549c5bbfeb3
    https://github.com/scummvm/scummvm/commit/8baaa873a14419861d0c8c007b62d549c5bbfeb3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-25T00:02:20+01:00

Commit Message:
DIRECTOR: LINGO: Implement 'the number of cast <x>'

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 ead735d..7260e6b 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -782,6 +782,9 @@ Datum Lingo::getTheCast(Datum &id1, int field) {
 	case kTheWidth:
 		d.u.i = _vm->getCurrentScore()->getCastMemberInitialRect(id).width();
 		break;
+	case kTheNumber:
+		d.u.i = id;
+		break;
 	default:
 		warning("Lingo::getTheCast(): Unprocessed getting field \"%s\" of cast %d", field2str(field), id);
 		d.type = VOID;




More information about the Scummvm-git-logs mailing list