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

[rvanlaar]

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:
fecea6ac2e DIRECTOR: Ignore sprites without a surface


Commit: fecea6ac2e7c117bc4146171143201707d4cee95
    https://github.com/scummvm/scummvm/commit/fecea6ac2e7c117bc4146171143201707d4cee95
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-02-23T15:48:14+01:00

Commit Message:
DIRECTOR: Ignore sprites without a surface

Windows .MMM files behave different than there mac counterparts.
The Director engine doesn't load the sprite surface, i.e.
it makes it a nullpointer. The surface is needed later on to
draw the files.

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 732a9ef..fff6612 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -642,7 +642,10 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 				warning("Frame::renderSprites(): No cast ID for sprite %d", i);
 				continue;
 			}
-
+			if (_sprites[i]->_cast->_surface == nullptr) {
+				warning("Frame::renderSprites(): No cast surface for sprite %d", i);
+				continue;
+			}
 			InkType ink;
 			if (i == _vm->getCurrentScore()->_currentMouseDownSpriteId)
 				ink = kInkTypeReverse;