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

Fixed the second batch of problems

Browse Source
This commit is contained in:
OBattler
2020-01-15 03:48:33 +01:00
parent fab0a368f1
commit af023ff5dd
14 changed files with 123 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/video/vid_ati18800.c
View File

@@ -86,6 +86,7 @@ static void ati18800_out(uint16_t addr, uint8_t val, void *p)
{
case 0xb0:
svga_recalctimings(svga);
break;
case 0xb2:
case 0xbe:
if (ati18800->regs[0xbe] & 8) /*Read/write bank mode*/

4
src/video/vid_im1024.c
View File

@@ -523,6 +523,10 @@ hndl_poly(pgc_t *pgc)
#ifdef ENABLE_IM1024_LOG
im1024_log("IM1024: POLY: out of memory\n");
#endif
if (x)
free(x);
if (y)
free(y);
return;
}

14
src/video/video.c
View File

@@ -933,11 +933,15 @@ loadfont(wchar_t *s, int format)
case 1: /* PC200 */
for (d = 0; d < 4; d++) {
/* There are 4 fonts in the ROM */
for (c = 0; c < 256; c++) /* 8x14 MDA in 8x16 cell */
fread(&fontdatm[256*d + c][0], 1, 16, f);
for (c = 0; c < 256; c++) { /* 8x14 MDA in 8x16 cell */
if (fread(&fontdatm[256*d + c][0], 1, 16, f) != 16)
fatal("loadfont(): Error reading 8x16 font in PC200 mode, c = %i\n", c);
}
for (c = 0; c < 256; c++) { /* 8x8 CGA in 8x16 cell */
fread(&fontdat[256*d + c][0], 1, 8, f);
fseek(f, 8, SEEK_CUR);
if (fread(&fontdat[256*d + c][0], 1, 8, f) != 8)
fatal("loadfont(): Error reading 8x8 font in PC200 mode, c = %i\n", c);
if (fseek(f, 8, SEEK_CUR) == -1)
fatal("loadfont(): Error seeking in PC200 mode, c = %i\n", c);
}
}
break;
@@ -1015,7 +1019,7 @@ loadfont(wchar_t *s, int format)
/* The second 4k holds an 8x16 font */
for (c = 0; c < 256; c++) {
if (fread(&fontdatm[c][0], 1, 16, f) != 16)
fatal("loadfont(): Error reading font file in Sigma Coloar 400 mdoe, c = %i\n", c);
fatal("loadfont(): Error reading 8x16 font in Sigma Color 400 mode, c = %i\n", c);
}
break;