[Scummvm-git-logs] scummvm branch-2-2 -> fee59d4ed869a371bd9dd836b55346813e36e0c2

[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:
fee59d4ed8 XEEN: Fix occasional border corruption during fights


Commit: fee59d4ed869a371bd9dd836b55346813e36e0c2
    https://github.com/scummvm/scummvm/commit/fee59d4ed869a371bd9dd836b55346813e36e0c2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-18T08:13:41-07:00

Commit Message:
XEEN: Fix occasional border corruption during fights

Changed paths:
    engines/xeen/sprites.cpp


diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp
index 8b847bea21..cb2a02d583 100644
--- a/engines/xeen/sprites.cpp
+++ b/engines/xeen/sprites.cpp
@@ -361,8 +361,10 @@ void SpriteDrawer::draw(XSurface &dest, uint16 offset, const Common::Point &pt,
 
 			// Handle drawing out the line
 			byte *destP = (byte *)dest.getBasePtr(destPos.x, destPos.y);
-			_destLeft = (byte *)dest.getBasePtr(clipRect.left, destPos.y);
-			_destRight = (byte *)dest.getBasePtr(clipRect.right, destPos.y);
+			_destLeft = (byte *)dest.getBasePtr(
+				(flags & SPRFLAG_SCENE_CLIPPED) ? SCENE_CLIP_LEFT : clipRect.left, destPos.y);
+			_destRight = (byte *)dest.getBasePtr(
+				(flags & SPRFLAG_SCENE_CLIPPED) ? SCENE_CLIP_RIGHT : clipRect.right, destPos.y);
 			int16 xp = destPos.x;
 			lineP = &tempLine[SCREEN_WIDTH];