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

[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:
e68e434b16 DIRECTOR: Fix typo in sprite type name
a473a9a19e DIRECTOR: Properly undraw sprite when cast changes
d2cc383f1e DIRECTOR: Add workaround for Chop Suey cursor


Commit: e68e434b16d36229c7f1f239b1487da182a48ebf
    https://github.com/scummvm/scummvm/commit/e68e434b16d36229c7f1f239b1487da182a48ebf
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-30T15:37:46-04:00

Commit Message:
DIRECTOR: Fix typo in sprite type name

Changed paths:
    engines/director/types.h


diff --git a/engines/director/types.h b/engines/director/types.h
index 278954f2d4..fb4454acd0 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -132,7 +132,7 @@ enum SpriteType {
 	kOutlinedRectangleSprite		= 12,	// QuickDraw
 	kOutlinedRoundedRectangleSprite	= 13,	// QuickDraw
 	kOutlinedOvalSprite				= 14,	// QuickDraw
-	kThinkLineSprite				= 15,	// 2pt width line
+	kThickLineSprite				= 15,	// 2pt width line
 	kCastMemberSprite				= 16,	// Specified by cast member
 	kFilmLoopSpite					= 17,
 	kDirMovieSprite					= 18


Commit: a473a9a19e1c6b9001dd8a0270efe85a16c4fd30
    https://github.com/scummvm/scummvm/commit/a473a9a19e1c6b9001dd8a0270efe85a16c4fd30
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-30T17:10:28-04:00

Commit Message:
DIRECTOR: Properly undraw sprite when cast changes

Before, if the previous cast was bigger than the new cast, there would be artifacts left.

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 acdbcc952e..b63e566192 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -834,8 +834,8 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		sprite->_blend = d.asInt();
 		break;
 	case kTheCastNum:
-		// Don't cause unnecessary flashing
 		if (d.asInt() != sprite->_castId) {
+			g_director->getStage()->addDirtyRect(channel->getBbox());
 			sprite->setCast(d.asInt());
 		}
 		break;


Commit: d2cc383f1ed3e57e0240394a02b4adca083baade
    https://github.com/scummvm/scummvm/commit/d2cc383f1ed3e57e0240394a02b4adca083baade
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-30T17:10:28-04:00

Commit Message:
DIRECTOR: Add workaround for Chop Suey cursor

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 b63e566192..c7418eb4dc 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -872,9 +872,21 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		sprite->_thickness = d.asInt();
 		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;
+		}
+
 		channel->addDelta(Common::Point(d.asInt() - channel->_currentPoint.x, 0));
 		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;
+		}
+
 		channel->addDelta(Common::Point(0, d.asInt() - channel->_currentPoint.y));
 		break;
 	case kTheMoveableSprite: