[Scummvm-git-logs] scummvm master -> 961eb636336909298531be39b12060751e1ec5a5

[npjg]

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

Summary:
961eb63633 DIRECTOR: Don't get position of null cast


Commit: 961eb636336909298531be39b12060751e1ec5a5
    https://github.com/scummvm/scummvm/commit/961eb636336909298531be39b12060751e1ec5a5
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-17T12:16:06-04:00

Commit Message:
DIRECTOR: Don't get position of null cast

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index e1e67bac80..caa18a6e0a 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -73,7 +73,7 @@ void Channel::addDelta(Common::Point pos) {
 Common::Point Channel::getPosition() {
 	Common::Point res = _currentPoint;
 
-	if (_sprite->_castType == kCastBitmap) {
+	if (_sprite->_castType == kCastBitmap && _sprite->_cast) {
 		BitmapCast *bc = (BitmapCast *)(_sprite->_cast);
 
 		res += Common::Point(bc->_initialRect.left - bc->_regX,