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

[djsrv]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8313c2cf6a DIRECTOR: LINGO: Fix unsafe int/bool comparison
c883a98b72 DIRECTOR: JANITORIAL: Make int->bool cast explicit


Commit: 8313c2cf6a3979c640ca4f57efa860419f9bc72e
    https://github.com/scummvm/scummvm/commit/8313c2cf6a3979c640ca4f57efa860419f9bc72e
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-21T12:38:42-04:00

Commit Message:
DIRECTOR: LINGO: Fix unsafe int/bool comparison

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 8d156c46ed..7aa9154383 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1438,7 +1438,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		break;
 	case kTheVisibility:
 	case kTheVisible:
-		if (d.asInt() != channel->_visible) {
+		if ((bool)d.asInt() != channel->_visible) {
 			channel->_visible = d.asInt();
 			channel->_dirty = true;
 		}


Commit: c883a98b722c007171fa2f3095d057e1f60b0c81
    https://github.com/scummvm/scummvm/commit/c883a98b722c007171fa2f3095d057e1f60b0c81
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-21T12:38:42-04:00

Commit Message:
DIRECTOR: JANITORIAL: Make int->bool cast explicit

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


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index bb968dadd0..d35894468a 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -421,10 +421,10 @@ bool Window::setField(int field, const Datum &value) {
 		setTitle(value.asString());
 		return true;
 	case kTheTitleVisible:
-		setTitleVisible(value.asInt());
+		setTitleVisible((bool)value.asInt());
 		return true;
 	case kTheVisible:
-		setVisible(value.asInt());
+		setVisible((bool)value.asInt());
 		return true;
 	case kTheWindowType:
 		setWindowType(value.asInt());