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

Merge pull request #1652 from 86Box/master

Browse Source 
Brought the branch up to par with master.
This commit is contained in:
Miran Grča
2021-09-03 16:41:24 +02:00
committed by GitHub
parent 81db8ea205 dc33476e0d
commit b0ec4e1ece
32 changed files with 1993 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/machine/m_amstrad.c
View File

@@ -1643,8 +1643,6 @@ vid_init_200(amstrad_t *ams)
memset(vid, 0x00, sizeof(amsvid_t));
vid->emulation = device_get_config_int("video_emulation");
cga_palette = (device_get_config_int("display_type") << 1);
ams_inform(vid);
/* Default to CGA */
vid->dipswitches = 0x10;
@@ -1677,6 +1675,9 @@ vid_init_200(amstrad_t *ams)
cga_init(cga);
mda_init(mda);
cga_palette = (device_get_config_int("display_type") << 1);
ams_inform(vid);
/* Attribute 8 is white on black (on a real MDA it's black on black) */
mda_setcol(0x08, 0, 1, 15);
mda_setcol(0x88, 0, 1, 15);