DIRECTOR: Generalize sprite dimension getter

scummvm · Jul 7, 2020 · 2f12428 · 2f12428
1 parent 1c2f2b9
commit 2f12428
Showing 1 changed file with 2 additions and 4 deletions.
diff --git 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) {