[Scummvm-git-logs] scummvm master -> 7ef9772d0de2aff24c5c8d0d43b30d1ede22085f

[dreammaster]

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:
7ef9772d0d XEEN: Fix drawing of yellow rect around selected character


Commit: 7ef9772d0de2aff24c5c8d0d43b30d1ede22085f
    https://github.com/scummvm/scummvm/commit/7ef9772d0de2aff24c5c8d0d43b30d1ede22085f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-23T20:01:49-05:00

Commit Message:
XEEN: Fix drawing of yellow rect around selected character

Changed paths:
    engines/xeen/sprites.cpp


diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp
index 68382ab..8070368 100644
--- a/engines/xeen/sprites.cpp
+++ b/engines/xeen/sprites.cpp
@@ -257,7 +257,7 @@ void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Poi
 			assert(byteCount == lineLength);
 
 			drawBounds.top = MIN(drawBounds.top, destPos.y);
-			drawBounds.bottom = MAX(drawBounds.bottom, destPos.y);
+			drawBounds.bottom = MAX((int)drawBounds.bottom, destPos.y + 1);
 
 			// Handle drawing out the line
 			byte *destP = (byte *)dest.getBasePtr(destPos.x, destPos.y);
@@ -274,7 +274,7 @@ void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Poi
 					if (*lineP != -1 && xp >= bounds.left && xp < bounds.right &&
 							((!(flags & SPRFLAG_SCENE_CLIPPED) && !enlarge) || (xp >= SCENE_CLIP_LEFT && xp < SCENE_CLIP_RIGHT))) {
 						drawBounds.left = MIN(drawBounds.left, xp);
-						drawBounds.right = MAX(drawBounds.right, xp);
+						drawBounds.right = MAX((int)drawBounds.right, xp + 1);
 						*destP = (byte)*lineP;
 						if (enlarge)
 							*(destP + SCREEN_WIDTH) = (byte)*lineP;