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

[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:
a6fc2ee3dc DIRECTOR: JANITORIAL: Add explicit int->bool casts


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

Commit Message:
DIRECTOR: JANITORIAL: Add explicit int->bool casts

for sprite properties.

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


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index de985952b3..1a160f5078 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1879,7 +1879,7 @@ void LB::b_puppetSprite(int nargs) {
 				channel->_dirty = true;
 			}
 
-			sc->getSpriteById(sprite.asInt())->_puppet = state.asInt();
+			sc->getSpriteById(sprite.asInt())->_puppet = (bool)state.asInt();
 		} else {
 			warning("b_puppetSprite: sprite index out of bounds");
 		}
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 7aa9154383..9a6330b455 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1339,7 +1339,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		}
 		break;
 	case kTheImmediate:
-		sprite->_immediate = d.asInt();
+		sprite->_immediate = (bool)d.asInt();
 		break;
 	case kTheInk:
 		if (d.asInt() != sprite->_ink) {
@@ -1371,7 +1371,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		}
 		break;
 	case kTheMoveableSprite:
-		sprite->_moveable = d.asInt();
+		sprite->_moveable = (bool)d.asInt();
 		break;
 	case kTheMovieRate:
 		channel->_movieRate = d.asFloat();
@@ -1394,7 +1394,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		}
 		break;
 	case kThePuppet:
-		sprite->_puppet = d.asInt();
+		sprite->_puppet = (bool)d.asInt();
 		if (!d.asInt()) {
 			// TODO: Properly reset sprite properties after puppet disabled.
 			sprite->_moveable = false;
@@ -1439,7 +1439,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 	case kTheVisibility:
 	case kTheVisible:
 		if ((bool)d.asInt() != channel->_visible) {
-			channel->_visible = d.asInt();
+			channel->_visible = (bool)d.asInt();
 			channel->_dirty = true;
 		}
 		break;