From 593f20becd4bce33aad42b5604edfa6df509c3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20GIBERT?= <burniouf@users.noreply.github.com>
Date: Mon, 23 Mar 2015 18:09:21 +0100
Subject: [PATCH] bug fix

---
 DRV/DHGR.DRV.S.txt | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index 86ecc845..b6881735 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -243,12 +243,13 @@ SETPIXEL.COLOR	tya
 				
 				lda Color.Masks,x
 				beq .1
+				and Color.Pixels,y		apply color
+				sta GBYTE
 				
 				sta SETPAGE2
 				lda (ZPBASE)
 				and Color.NMasks,x		reset existing pixel, 
-				ora Color.Pixels,y		apply color
-				and Color.Enable,x		filter 4 color bits color.enable bit 
+				ora GBYTE
 				sta (ZPBASE)
 
 .1				inx
@@ -256,12 +257,13 @@ SETPIXEL.COLOR	tya
 				
 				lda Color.Masks,x
 				beq .2
+				and Color.Pixels,y		apply color
+				sta GBYTE
 				
 				sta CLRPAGE2
 				lda (ZPBASE)
 				and Color.NMasks,x		reset existing pixel, 
-				ora Color.Pixels,y		apply color
-				and Color.Enable,x		filter 4 color bits color.enable bit 
+				ora GBYTE
 				sta (ZPBASE)
 				
 .2				inc ZPBASE
@@ -270,12 +272,13 @@ SETPIXEL.COLOR	tya
 				
 				lda Color.Masks,x
 				beq .3
+				and Color.Pixels,y		apply color
+				sta GBYTE
 				
 				sta SETPAGE2
 				lda (ZPBASE)
 				and Color.NMasks,x		reset existing pixel, 
-				ora Color.Pixels,y		apply color
-				and Color.Enable,x		filter 4 color bits color.enable bit 
+				ora GBYTE
 				sta (ZPBASE)
 				
 .3				inx
@@ -283,13 +286,15 @@ SETPIXEL.COLOR	tya
 				
 				lda Color.Masks,x
 				beq .8
+				and Color.Pixels,y		apply color
+				sta GBYTE
 				
 				sta CLRPAGE2
 				lda (ZPBASE)
 				and Color.NMasks,x		reset existing pixel, 
-				ora Color.Pixels,y		apply color
-				and Color.Enable,x		filter 4 color bits color.enable bit 
+				ora GBYTE
 				sta (ZPBASE)
+				
 .8				rts
 *--------------------------------------
 GETPIXEL
@@ -471,7 +476,7 @@ Color.NMasks	.DA #%01110000,#%00000000,#%00000000,#%00000000
 * bits to "and"	to Get color of pixel (0 means nothing to do)
 * 4 bytes * 7 mods
 *--------------------------------------
-Color.Masks		.DA #%00001111,#%00000000,#%00000000,#%00000000	(nothing to do)
+Color.Masks.DEL	.DA #%00001111,#%00000000,#%00000000,#%00000000	(nothing to do)
 				.DA #%01110000,#%00000001,#%00000000,#%00000000	asl0,asl0,rol1,asl0,rol1,asl0,rol1
 				.DA #%00000000,#%00011110,#%00000000,#%00000000	lsr1
 				.DA #%00000000,#%01100000,#%00000011,#%00000000	asl1,asl1,rol2,asl1,rol2
@@ -479,7 +484,7 @@ Color.Masks		.DA #%00001111,#%00000000,#%00000000,#%00000000	(nothing to do)
 				.DA #%00000000,#%00000000,#%01000000,#%00000111	asl2,asl2,rol3
 				.DA #%00000000,#%00000000,#%00000000,#%01111000	lsr3,lsr3,lsr3	
 *--------------------------------------
-Color.Enable	.DA #%10001111,#%00000000,#%00000000,#%00000000
+Color.Masks		.DA #%10001111,#%00000000,#%00000000,#%00000000
 				.DA #%11110000,#%00000001,#%00000000,#%00000000
 				.DA #%00000000,#%10011110,#%00000000,#%00000000
 				.DA #%00000000,#%11100000,#%00000011,#%00000000
@@ -526,6 +531,7 @@ Color.Pixels	.DA #%00000000,#%00000000,#%00000000,#%00000000	(color bit disable)
 *White          7F    7F    7F    7F    1111
 *--------------------------------------
 DEVNAME			>PSTRING "GFX"
+GBYTE			.BS 1
 *--------------------------------------
 DS.START
 DEVINFO			.DA #S.DEV.F.GFX		type of DEVINFO STRUCT