[Scummvm-git-logs] scummvm master -> 2512ca2d5b03f91b99b4d5b3ad127c44a3cc7d36

[npjg]

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:
6011d53e78 DIRECTOR: Fix typo
2512ca2d5b GRAPHICS: MACGUI: Fix hex format decoding


Commit: 6011d53e78ecff591b81c44c21fd4dcd628d93a5
    https://github.com/scummvm/scummvm/commit/6011d53e78ecff591b81c44c21fd4dcd628d93a5
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-20T11:07:28-04:00

Commit Message:
DIRECTOR: Fix typo

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 addb9e728d..2614b66940 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1315,7 +1315,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 
 			if (cursorId == channel->_cursor._cursorCastId &&
 					maskId == channel->_cursor._cursorMaskId)
-				return;
+				break;
 
 			channel->_cursor.readFromCast(cursorId, maskId);
 			score->_cursorDirty = true;


Commit: 2512ca2d5b03f91b99b4d5b3ad127c44a3cc7d36
    https://github.com/scummvm/scummvm/commit/2512ca2d5b03f91b99b4d5b3ad127c44a3cc7d36
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-20T13:17:01-04:00

Commit Message:
GRAPHICS: MACGUI: Fix hex format decoding

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 31695be8e5..de3ab9819c 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -286,7 +286,7 @@ static const Common::U32String::value_type *readHex(uint16 *res, const Common::U
 		char b = (char)*s++;
 
 		*res <<= 4;
-		if (tolower(b) > 'a')
+		if (tolower(b) >= 'a')
 			*res |= tolower(b) - 'a' + 10;
 		else
 			*res |= tolower(b) - '0';