[Scummvm-git-logs] scummvm master -> 8dd0c305dd3044520f274c67c4c6fbb013c3a99c

[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:
203e87514c DIRECTOR: LINGO: Remove obsolete sprite rendering calls
8dd0c305dd GRAPHICS: MACGUI: Render all of the button


Commit: 203e87514c10c2555a71b6b0988d730cfb237a1c
    https://github.com/scummvm/scummvm/commit/203e87514c10c2555a71b6b0988d730cfb237a1c
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-23T16:04:11-04:00

Commit Message:
DIRECTOR: LINGO: Remove obsolete sprite rendering calls

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 d8ca5d7b8a..e72dba4bd4 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -882,8 +882,6 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 		break;
 	case kTheMoveableSprite:
 		sprite->_moveable = d.asInt();
-		if (!d.u.i)
-			channel->resetPosition();
 		break;
 	case kTheMovieRate:
 		sprite->_movieRate = d.asInt();
@@ -897,8 +895,6 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 	case kThePuppet:
 		sprite->_puppet = d.asInt();
 		if (!d.asInt()) {
-			channel->resetPosition();
-
 			// TODO: Properly reset sprite properties after puppet disabled.
 			sprite->_moveable = false;
 		}


Commit: 8dd0c305dd3044520f274c67c4c6fbb013c3a99c
    https://github.com/scummvm/scummvm/commit/8dd0c305dd3044520f274c67c4c6fbb013c3a99c
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-23T16:04:17-04:00

Commit Message:
GRAPHICS: MACGUI: Render all of the button

Changed paths:
    graphics/macgui/macbutton.cpp


diff --git a/graphics/macgui/macbutton.cpp b/graphics/macgui/macbutton.cpp
index ab5312b891..6b413dece3 100644
--- a/graphics/macgui/macbutton.cpp
+++ b/graphics/macgui/macbutton.cpp
@@ -108,7 +108,7 @@ bool MacButton::draw(bool forceRedraw) {
 	if (!_contentIsDirty && !forceRedraw)
 		return false;
 
-	_maskSurface->clear(0);
+	_maskSurface->clear(1);
 	MacText::draw();
 
 	Common::Rect r(_dims.width() - 1, _dims.height() - 1);