[Scummvm-git-logs] scummvm master -> 6ca9c1f8bfdb949e655ead7e66be902eaa414bce

[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:
6ca9c1f8bf DIRECTOR: fix check on array size


Commit: 6ca9c1f8bfdb949e655ead7e66be902eaa414bce
    https://github.com/scummvm/scummvm/commit/6ca9c1f8bfdb949e655ead7e66be902eaa414bce
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-08-26T12:58:06+02:00

Commit Message:
DIRECTOR: fix check on array size

Setting a cursor to a cast needs an array of 2 not 1.

Changed paths:
    engines/director/cursor.cpp


diff --git a/engines/director/cursor.cpp b/engines/director/cursor.cpp
index 0086b4ea17..800efc78ae 100644
--- a/engines/director/cursor.cpp
+++ b/engines/director/cursor.cpp
@@ -57,8 +57,8 @@ bool Cursor::operator==(const CursorRef &c) {
 }
 
 void Cursor::readFromCast(Datum cursorCasts) {
-	if (cursorCasts.type != ARRAY && cursorCasts.u.farr->arr.size() != 2 ) {
-		warning("Cursor::readFromCast: Needs array");
+	if (cursorCasts.type != ARRAY || cursorCasts.u.farr->arr.size() != 2 ) {
+		warning("Cursor::readFromCast: Needs array of 2");
 		return;
 	}
 	if (_cursorResId.equalTo(cursorCasts))