claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed CGA, Hercules, and MDA.

Browse Source
This commit is contained in:
OBattler
2017-02-19 17:32:35 +01:00
parent 7aa2b9c50e
commit 7dccffbb0d
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/win-cgapal.h
View File

@@ -1,6 +1,8 @@
extern PALETTE cgapal; extern PALETTE cgapal;
extern PALETTE cgapal_mono[6]; extern PALETTE cgapal_mono[6];
extern uint32_t pal_lookup[256];
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

6
src/win-d3d-fs.cc
View File

@@ -94,7 +94,7 @@ PALETTE cgapal_mono[6] =
}, },
}; };
static uint32_t pal_lookup[256]; uint32_t pal_lookup[256];
static CUSTOMVERTEX d3d_verts[] = static CUSTOMVERTEX d3d_verts[] =
{ {
@@ -111,11 +111,11 @@ void cgapal_rebuild()
{ {
int c; int c;
for (c = 0; c < 256; 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) if (cga_palette > 1)
{ {
for (c = 0; c < 16; c++) 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]);
} }
} }

2
src/win-d3d.cc
View File

@@ -36,8 +36,6 @@ struct CUSTOMVERTEX
FLOAT tu, tv; FLOAT tu, tv;
}; };
static uint32_t pal_lookup[256];
static CUSTOMVERTEX d3d_verts[] = static CUSTOMVERTEX d3d_verts[] =
{ {
{ 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f},

2
src/win-ddraw-fs.cc
View File

@@ -34,8 +34,6 @@ static DDSURFACEDESC2 ddsd;
static HWND ddraw_hwnd; static HWND ddraw_hwnd;
static int ddraw_w, ddraw_h; static int ddraw_w, ddraw_h;
static uint32_t pal_lookup[256];
void ddraw_fs_init(HWND h) void ddraw_fs_init(HWND h)
{ {
int c; int c;

2
src/win-ddraw.cc
View File

@@ -34,8 +34,6 @@ static DDSURFACEDESC2 ddsd;
static HWND ddraw_hwnd; static HWND ddraw_hwnd;
static uint32_t pal_lookup[256];
void ddraw_init(HWND h) void ddraw_init(HWND h)
{ {
int c; int c;