From 7dccffbb0d2b1df1957c270e5a565d8fe4ee36b1 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 19 Feb 2017 17:32:35 +0100
Subject: [PATCH] Fixed CGA, Hercules, and MDA.

---
 src/win-cgapal.h    | 2 ++
 src/win-d3d-fs.cc   | 6 +++---
 src/win-d3d.cc      | 2 --
 src/win-ddraw-fs.cc | 2 --
 src/win-ddraw.cc    | 2 --
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/win-cgapal.h b/src/win-cgapal.h
index bb6dd7f93..40056a2b1 100644
--- a/src/win-cgapal.h
+++ b/src/win-cgapal.h
@@ -1,6 +1,8 @@
 extern PALETTE cgapal;
 extern PALETTE cgapal_mono[6];
 
+extern uint32_t pal_lookup[256];
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/win-d3d-fs.cc b/src/win-d3d-fs.cc
index ca270ba5c..d6fad07c5 100644
--- a/src/win-d3d-fs.cc
+++ b/src/win-d3d-fs.cc
@@ -94,7 +94,7 @@ PALETTE cgapal_mono[6] =
 	},
 };
 
-static uint32_t pal_lookup[256];
+uint32_t pal_lookup[256];
 
 static CUSTOMVERTEX d3d_verts[] =
 {
@@ -111,11 +111,11 @@ void cgapal_rebuild()
 {
         int c;
         for (c = 0; c < 256; c++)
-            pal_lookup[c] = makecol(cgapal[c].r << 2, cgapal[c].g << 2, cgapal[c].b << 2);
+            pal_lookup[c] = makecol(video_6to8[cgapal[c].r], video_6to8[cgapal[c].g], video_6to8[cgapal[c].b]);
 	if (cga_palette > 1)
 	{
 	        for (c = 0; c < 16; c++)
-        	    pal_lookup[c + 16] = makecol(cgapal_mono[cga_palette - 1][c].r, cgapal_mono[cga_palette - 1][c].g, cgapal_mono[cga_palette - 1][c].b);
+        	    pal_lookup[c + 16] = makecol(video_6to8[cgapal_mono[cga_palette - 1][c].r], video_6to8[cgapal_mono[cga_palette - 1][c].g], video_6to8[cgapal_mono[cga_palette - 1][c].b]);
 	}
 }
   
diff --git a/src/win-d3d.cc b/src/win-d3d.cc
index 46a86ca56..12c40351f 100644
--- a/src/win-d3d.cc
+++ b/src/win-d3d.cc
@@ -36,8 +36,6 @@ struct CUSTOMVERTEX
      FLOAT tu, tv;
 };
 
-static uint32_t pal_lookup[256];
-
 static CUSTOMVERTEX d3d_verts[] =
 {
      {   0.0f,    0.0f, 1.0f, 1.0f, 0.0f, 0.0f},
diff --git a/src/win-ddraw-fs.cc b/src/win-ddraw-fs.cc
index fdb31313a..ed18c9b64 100644
--- a/src/win-ddraw-fs.cc
+++ b/src/win-ddraw-fs.cc
@@ -34,8 +34,6 @@ static DDSURFACEDESC2 ddsd;
 static HWND ddraw_hwnd;
 static int ddraw_w, ddraw_h;
 
-static uint32_t pal_lookup[256];
-        
 void ddraw_fs_init(HWND h)
 {
         int c;
diff --git a/src/win-ddraw.cc b/src/win-ddraw.cc
index 44cd43209..8aadfac56 100644
--- a/src/win-ddraw.cc
+++ b/src/win-ddraw.cc
@@ -34,8 +34,6 @@ static DDSURFACEDESC2 ddsd;
 
 static HWND ddraw_hwnd;
 
-static uint32_t pal_lookup[256];
-        
 void ddraw_init(HWND h)
 {
         int c;