From 8cad0222bba6e3c34d25153bd62f4aaba012d094 Mon Sep 17 00:00:00 2001
From: TomW <TomW@localhost>
Date: Sat, 16 Nov 2013 17:25:44 +0000
Subject: [PATCH] S3 line draw now uses correct foreground/background mix.

---
 src/vid_s3.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vid_s3.c b/src/vid_s3.c
index 990c0ad..10fb8f8 100644
--- a/src/vid_s3.c
+++ b/src/vid_s3.c
@@ -959,6 +959,10 @@ void s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         s3->accel.sy = s3->accel.maj_axis_pcnt;
                 }
                 if ((s3->accel.cmd & 0x100) && !cpu_input) return; /*Wait for data from CPU*/
+
+                frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
+                bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
+
                 if (s3->accel.cmd & 8) /*Radial*/
                 {
                         while (count-- && s3->accel.sy >= 0)
@@ -1457,7 +1461,7 @@ void s3_hwcursor_draw(svga_t *svga, int displine)
         int xx;
         int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
         
-        pclog("HWcursor %i %i\n", svga->hwcursor_latch.x, svga->hwcursor_latch.y);
+//        pclog("HWcursor %i %i\n", svga->hwcursor_latch.x, svga->hwcursor_latch.y);
         for (x = 0; x < 64; x += 16)
         {
                 dat[0] = (svga->vram[svga->hwcursor_latch.addr]     << 8) | svga->vram[svga->hwcursor_latch.addr + 1];