[Scummvm-git-logs] scummvm master -> 41f4e6e95aa3c053280e2e1e23c47fcf3ac81f5b

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


Commit: 41f4e6e95aa3c053280e2e1e23c47fcf3ac81f5b
    https://github.com/scummvm/scummvm/commit/41f4e6e95aa3c053280e2e1e23c47fcf3ac81f5b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-15T20:47:06-07:00

Commit Message:
XEEN: Fix occasional border corruption during fights

Changed paths:
    NEWS.md
    engines/xeen/sprites.cpp


diff --git a/NEWS.md b/NEWS.md
index 8237946a59..6c3d645161 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -9,6 +9,9 @@ For a more comprehensive changelog of the latest experimental code, see:
  Supernova:
    - Added Italian translation for part 1.
 
+ Xeen:
+   - Fixed occasional border corruption during fights
+
 #### 2.2.0 (2020-09-27)
 
  New games:
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];