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

[moralrecordings]

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:
c0a8205961 DIRECTOR: Fix undefined sprites when calling kEventStartMovie


Commit: c0a8205961d1a379e36830388ffed7f9029f064f
    https://github.com/scummvm/scummvm/commit/c0a8205961d1a379e36830388ffed7f9029f064f
Author: Scott Percival (code at moral.net.au)
Date: 2020-05-20T00:01:10+08:00

Commit Message:
DIRECTOR: Fix undefined sprites when calling kEventStartMovie

Changed paths:
    engines/director/score.cpp
    engines/director/sprite.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 34b81dda8d..17d5a5cfd2 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1738,6 +1738,7 @@ void Score::startLoop() {
 	_stopPlay = false;
 	_nextFrameTime = 0;
 
+	_sprites = _frames[_currentFrame]->_sprites;
 	_lingo->processEvent(kEventStartMovie);
 
 	_sprites = _frames[_currentFrame]->_sprites;
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index e7b12bc862..aecb8ccbe1 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -37,6 +37,7 @@ Sprite::Sprite() {
 	_castId = 0;
 	_castIndex = 0;
 	_spriteType = kInactiveSprite;
+	_castType = kCastTypeNull;
 	_inkData = 0;
 	_ink = kInkTypeCopy;
 	_trails = 0;