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

[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:
2f12428b71 DIRECTOR: Generalize sprite dimension getter
bb4dd0f001 DIRECTOR: Fix erroneous test condition


Commit: 2f12428b718f3da88bfb62ef5af1f722d670761f
    https://github.com/scummvm/scummvm/commit/2f12428b718f3da88bfb62ef5af1f722d670761f
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-07T09:36:29-04:00

Commit Message:
DIRECTOR: Generalize sprite dimension getter

Changed paths:
    engines/director/sprite.cpp


diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 34d2f70593..740bb25420 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -173,12 +173,10 @@ void Sprite::setCast(uint16 castId) {
 Common::Rect Sprite::getDims() {
 	Common::Rect result;
 
-	if (!_cast || _cast->_type == kCastShape) {
-		result = Common::Rect(_width, _height);
-	} else if (_cast->_widget) {
+	if (_cast && _cast->_widget) {
 		result = Common::Rect(_cast->_widget->_dims.width(), _cast->_widget->_dims.height());
 	} else {
-		warning("Sprite::getDims(): Unable to find sprite dimensions");
+		result = Common::Rect(_width, _height);
 	}
 
 	if (_puppet && _stretch) {


Commit: bb4dd0f001aaaf93f98d0901f7917a85438b2bb8
    https://github.com/scummvm/scummvm/commit/bb4dd0f001aaaf93f98d0901f7917a85438b2bb8
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-07T12:31:10-04:00

Commit Message:
DIRECTOR: Fix erroneous test condition

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 7fda7d8bd9..0397987811 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -189,7 +189,7 @@ Common::Point Channel::getPosition() {
 }
 
 MacShape *Channel::getShape() {
-	if (!_sprite->isQDShape() && (_sprite->_cast && _sprite->_cast->_type != kCastShape))
+	if (!_sprite->isQDShape() || (_sprite->_cast && _sprite->_cast->_type != kCastShape))
 		return nullptr;
 
 	MacShape *shape = new MacShape();