[Scummvm-git-logs] scummvm master -> 3c7781d880d00d125328f32713bdf1c564d10954

sev- sev at scummvm.org
Sat May 23 14:35:38 UTC 2020


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:
3c7781d880 DIRECTOR: LINGO: Check for empty score on attempt to set an entity


Commit: 3c7781d880d00d125328f32713bdf1c564d10954
    https://github.com/scummvm/scummvm/commit/3c7781d880d00d125328f32713bdf1c564d10954
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-23T16:35:10+02:00

Commit Message:
DIRECTOR: LINGO: Check for empty score on attempt to set an entity

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


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 440d946f05..db366b6677 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -331,6 +331,13 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 
 	Datum d;
 
+	if (!_vm->getCurrentScore()) {
+		warning("Lingo::getTheEntity(): Score is missing");
+		d.type = VOID;
+
+		return d;
+	}
+
 	switch (entity) {
 	case kTheCast:
 		d = getTheCast(id, field);




More information about the Scummvm-git-logs mailing list