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

[djsrv]

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:
f32d7e20eb DIRECTOR: LINGO: Handle null sprites in intersects


Commit: f32d7e20eb8f5e1ab861013e10bc1b1c589ac247
    https://github.com/scummvm/scummvm/commit/f32d7e20eb8f5e1ab861013e10bc1b1c589ac247
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-16T17:16:15-04:00

Commit Message:
DIRECTOR: LINGO: Handle null sprites in intersects

Changed paths:
    engines/director/lingo/lingo-code.cpp


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 243024e996..278b4478f9 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -793,6 +793,11 @@ void LC::c_intersects() {
 	Sprite *sprite1 = score->getSpriteById(d1.asInt());
 	Sprite *sprite2 = score->getSpriteById(d2.asInt());
 
+	if (!sprite1 || !sprite2) {
+		g_lingo->push(Datum(0));
+		return;
+	}
+
 	g_lingo->push(Datum(sprite1->getBbox().intersects(sprite2->getBbox())));
 }
 
@@ -804,6 +809,11 @@ void LC::c_within() {
 	Sprite *sprite1 = score->getSpriteById(d1.asInt());
 	Sprite *sprite2 = score->getSpriteById(d2.asInt());
 
+	if (!sprite1 || !sprite2) {
+		g_lingo->push(Datum(0));
+		return;
+	}
+
 	g_lingo->push(Datum(sprite2->getBbox().contains(sprite1->getBbox())));
 }