[Scummvm-git-logs] scummvm master -> 43650c1a8a9b6cbd5fbce586ea868b1a3267fd94

[npjg]

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

Summary:
e46e81f505 DIRECTOR: Add castNum to null cast warning
43650c1a8a DIRECTOR: Don't try to make shapes from bitmaps


Commit: e46e81f5059518661011041780697d8f9fe1c191
    https://github.com/scummvm/scummvm/commit/e46e81f5059518661011041780697d8f9fe1c191
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-10T11:58:33-04:00

Commit Message:
DIRECTOR: Add castNum to null cast warning

Changed paths:
    engines/director/sprite.cpp


diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 8353c03d49..d3b2da486f 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -187,7 +187,7 @@ void Sprite::setCast(uint16 castId) {
 		_width = dims.width();
 		_height = dims.height();
 	} else {
-		warning("Sprite::setCast(): CastMember id %d has null member", castId);
+		warning("Sprite::setCast(): CastMember id %d(%s) has null member", castId, numToCastNum(castId));
 	}
 }
 


Commit: 43650c1a8a9b6cbd5fbce586ea868b1a3267fd94
    https://github.com/scummvm/scummvm/commit/43650c1a8a9b6cbd5fbce586ea868b1a3267fd94
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-10T11:59:06-04:00

Commit Message:
DIRECTOR: Don't try to make shapes from bitmaps

This is so a proper null cast and then surface-not-found warning can be issued.

Changed paths:
    engines/director/channel.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 68bed4609f..5acaa25ba9 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -69,7 +69,7 @@ DirectorPlotData Channel::getPlotData() {
 	pd.dst = nullptr;
 
 	pd.srf = getSurface();
-	if (!pd.srf) {
+	if (!pd.srf && _sprite->_spriteType != kBitmapSprite) {
 		// Shapes come colourized from macDrawPixel
 		pd.ms = getShape();
 		pd.applyColor = false;