[Scummvm-git-logs] scummvm master -> 25ebf333c7df217c3887684d8b05304e4f2830a6

[npjg]

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

Summary:
8084447e4d DIRECTOR: Trigger targets using picture castmembers
2fea1b4345 DIRECTOR: Remove noisy warnings
25ebf333c7 DIRECTOR: Confirm kTheCastType is read-only


Commit: 8084447e4dd9b3ae6d6560b17d7adb382b16e0c7
    https://github.com/scummvm/scummvm/commit/8084447e4dd9b3ae6d6560b17d7adb382b16e0c7
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-27T18:55:36-04:00

Commit Message:
DIRECTOR: Trigger targets using picture castmembers

This is for the buildbot.

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 48813c8b3a..3ddfae4131 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -814,7 +814,7 @@ void Cast::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id,
 		_loadedCast->setVal(id, new PaletteCastMember(this, id, castStream, _vm->getVersion()));
 		break;
 	case kCastPicture:
-		warning("STUB: Cast::loadCastData(): kCastPicture (%d children)", res->children.size());
+		warning("BUILDBOT: STUB: Cast::loadCastData(): kCastPicture (%d children)", res->children.size());
 		castInfoSize = 0;
 		break;
 	case kCastMovie:


Commit: 2fea1b4345716f123f7a4fe39357f551050f8796
    https://github.com/scummvm/scummvm/commit/2fea1b4345716f123f7a4fe39357f551050f8796
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-27T18:56:00-04:00

Commit Message:
DIRECTOR: Remove noisy warnings

The enabling of moveable sprite is also disabled.

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 161fe05711..c069747f53 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1281,12 +1281,6 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		warning("STUB: Lingo::setTheSprite(): Unprocessed setting field \"%s\" of sprite", field2str(field));
 		break;
 	case kTheLocH:
-		if (!sprite->_moveable) {
-			// WORKAROUND: Chop Suey moon cursor is marked neither puppet nor moveable
-			warning("Lingo::setTheSprite(): Attempting to set \"%s\" of non-moveable sprite. Enabling moveable for now", field2str(field));
-			sprite->_moveable = true;
-		}
-
 		if (d.asInt() != channel->_currentPoint.x) {
 			g_director->getCurrentMovie()->getStage()->addDirtyRect(channel->getBbox());
 			channel->_currentPoint.x = d.asInt();
@@ -1295,12 +1289,6 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		}
 		break;
 	case kTheLocV:
-		if (!sprite->_moveable) {
-			// WORKAROUND: Chop Suey moon cursor is marked neither puppet nor moveable
-			warning("Lingo::setTheSprite(): Attempting to set \"%s\" of non-moveable sprite. Enabling moveable for now", field2str(field));
-			sprite->_moveable = true;
-		}
-
 		if (d.asInt() != channel->_currentPoint.y) {
 			g_director->getCurrentMovie()->getStage()->addDirtyRect(channel->getBbox());
 			channel->_currentPoint.y = d.asInt();


Commit: 25ebf333c7df217c3887684d8b05304e4f2830a6
    https://github.com/scummvm/scummvm/commit/25ebf333c7df217c3887684d8b05304e4f2830a6
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-27T18:56:00-04:00

Commit Message:
DIRECTOR: Confirm kTheCastType is read-only

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 c069747f53..682c536012 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1577,10 +1577,7 @@ void Lingo::setTheCast(Datum &id1, int field, Datum &d) {
 			break;
 		}
 	case kTheCastType:
-		// TODO: You can actually switch the cast type!?
-		warning("Lingo::setTheCast(): Tried to switch cast type of %d", id);
-		//cast->type = static_cast<CastType>(d.u.i);
-		//cast->modified = 1;
+		warning("Lingo::setTheCast(): Attempt to set read-only field %s of cast %d", entity2str(field), id);
 		break;
 	case kTheCenter:
 		if (castType == kCastDigitalVideo) {