valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

By implementing Tandy special handling of the palette:

Browse source 
- fix Starflight background color (reported by HunterZ)
- keep Pirates! map background correct

Also fix the palette after mode switch on the PCJr. Fixes Frogger II composite mode color attributes (reported by VileRancour).


Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3832
This commit is contained in:
Ralf Grillenberger 2013-06-16 20:42:27 +00:00
parent f6864ba395
commit 56d19f4f8d
2 changed files with 47 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/hardware/vga_other.cpp
View file

@ -438,9 +438,7 @@ static void tandy_update_palette() {
switch (vga.mode) {
case M_TANDY2:
VGA_SetCGA2Table(vga.attr.palette[0],
//vga.attr.palette[vga.tandy.color_select&0xf]);
vga.attr.palette[0xf]);
//VGA_SetCGA2Table(vga.attr.palette[0xf],vga.attr.palette[0]);
vga.attr.palette[vga.tandy.color_select&0xf]);
break;
case M_TANDY4:
if (vga.tandy.gfx_control & 0x8) {
@ -458,7 +456,7 @@ static void tandy_update_palette() {
r_mask &= ~1;
}
VGA_SetCGA4Table(
vga.attr.palette[0],
vga.attr.palette[vga.tandy.color_select&0xf],
vga.attr.palette[(2|color_set)& vga.tandy.palette_mask],
vga.attr.palette[(4|(color_set& r_mask))& vga.tandy.palette_mask],
vga.attr.palette[(6|color_set)& vga.tandy.palette_mask]);
@ -523,6 +521,7 @@ static void PCJr_FindMode(void) {
if (vga.mode==M_TANDY16) VGA_SetModeNow(M_TANDY4);
else VGA_SetMode(M_TANDY4);
}
tandy_update_palette();
} else {
VGA_SetMode(M_TANDY_TEXT);
}
@ -588,17 +587,19 @@ static void write_tandy_reg(Bit8u val) {
static void write_tandy(Bitu port,Bitu val,Bitu /*iolen*/) {
switch (port) {
case 0x3d8:
vga.tandy.mode_control=(Bit8u)val;
if (val&0x8) vga.attr.disabled &= ~1;
else vga.attr.disabled |= 1;
TandyCheckLineMask();
VGA_SetBlinking(val & 0x20);
TANDY_FindMode();
val &= 0x3f; // only bits 0-6 are used
if (vga.tandy.mode_control ^ val) {
vga.tandy.mode_control=(Bit8u)val;
if (val&0x8) vga.attr.disabled &= ~1;
else vga.attr.disabled |= 1;
TandyCheckLineMask();
VGA_SetBlinking(val & 0x20);
TANDY_FindMode();
VGA_StartResize();
}
break;
case 0x3d9:
vga.tandy.color_select=val;
if (vga.mode==M_TANDY2) vga.attr.palette[0xf] = vga.tandy.color_select&0xf;
else vga.attr.palette[0] = vga.tandy.color_select&0xf; // Pirates!
tandy_update_palette();
break;
case 0x3da: