[Scummvm-git-logs] scummvm master -> ada09b816240d1a57ed1d50e47342096ed232665

[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:
ada09b8162 XEEN: Fix rendering of Count Blackfang


Commit: ada09b816240d1a57ed1d50e47342096ed232665
    https://github.com/scummvm/scummvm/commit/ada09b816240d1a57ed1d50e47342096ed232665
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-31T16:42:40-07:00

Commit Message:
XEEN: Fix rendering of Count Blackfang

Changed paths:
    engines/xeen/sprites.cpp
    engines/xeen/sprites.h


diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp
index 4ac5383..fdd1f32 100644
--- a/engines/xeen/sprites.cpp
+++ b/engines/xeen/sprites.cpp
@@ -517,14 +517,14 @@ void SpriteDrawer5::rcr(uint16 &val, bool &cf) {
 
 /*------------------------------------------------------------------------*/
 
-const byte DRAWER6_COLOR[16] = { 1, 2, 4, 8, 1, 3, 7, 15, 8, 12, 14, 15, 1, 2, 1, 2 };
+const byte DRAWER6_MASK[16] = { 1, 2, 4, 8, 1, 3, 7, 15, 8, 12, 14, 15, 1, 2, 1, 2 };
 
 SpriteDrawer6::SpriteDrawer6(byte *data, size_t filesize, int index) : SpriteDrawer(data, filesize) {
-	_color = DRAWER6_COLOR[index];
+	_mask = DRAWER6_MASK[index];
 }
 
 void SpriteDrawer6::drawPixel(byte *dest, byte pixel) {
-	*dest = _color;
+	*dest = pixel ^ _mask;
 }
 
 } // End of namespace Xeen
diff --git a/engines/xeen/sprites.h b/engines/xeen/sprites.h
index 5a24588..c19a7ba 100644
--- a/engines/xeen/sprites.h
+++ b/engines/xeen/sprites.h
@@ -278,7 +278,7 @@ public:
 
 class SpriteDrawer6 : public SpriteDrawer {
 private:
-	byte _color;
+	byte _mask;
 protected:
 	/**
 	 * Output a pixel