80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed EGA display broken by an earlier commit, fixes #417.

Browse Source
This commit is contained in:
OBattler
2019-09-29 10:32:03 +02:00
parent 363b5ab254
commit 33094a164d
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/vid_cga.c
View File

@@ -8,13 +8,13 @@
* *
* Emulation of the old and new IBM CGA graphics cards. * Emulation of the old and new IBM CGA graphics cards.
* *
* Version: @(#)vid_cga.c 1.0.19 2019/01/18 * Version: @(#)vid_cga.c 1.0.20 2019/09/29
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* *
* Copyright 2008-2018 Sarah Walker. * Copyright 2008-2019 Sarah Walker.
* Copyright 2016-2018 Miran Grca. * Copyright 2016-2019 Miran Grca.
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
@@ -451,8 +451,6 @@ cga_poll(void *p)
video_force_resize_get())) { video_force_resize_get())) {
xsize = xs_temp; xsize = xs_temp;
ysize = ys_temp; ysize = ys_temp;
if (xsize < 64) xsize = 656;
if (ysize < 32) ysize = 400;
set_screen_size(xsize, ysize + 16); set_screen_size(xsize, ysize + 16);
if (video_force_resize_get()) if (video_force_resize_get())

17
src/video/vid_ega.c
View File

@@ -9,7 +9,7 @@
* Emulation of the EGA, Chips & Technologies SuperEGA, and * Emulation of the EGA, Chips & Technologies SuperEGA, and
* AX JEGA graphics cards. * AX JEGA graphics cards.
* *
* Version: @(#)vid_ega.c 1.0.20 2019/09/26 * Version: @(#)vid_ega.c 1.0.21 2019/09/29
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -554,6 +554,11 @@ void ega_poll(void *p)
ys_temp = ega->lastline - ega->firstline + 1; ys_temp = ega->lastline - ega->firstline + 1;
if ((xs_temp > 0) && (ys_temp > 1)) { if ((xs_temp > 0) && (ys_temp > 1)) {
if (xs_temp < 64)
xs_temp = 640;
if (ys_temp < 32)
ys_temp = 200;
x_add = enable_overscan ? 8 : 0; x_add = enable_overscan ? 8 : 0;
y_add = enable_overscan ? overscan_y : 0; y_add = enable_overscan ? overscan_y : 0;
x_add_ex = enable_overscan ? 16 : 0; x_add_ex = enable_overscan ? 16 : 0;
@@ -566,14 +571,10 @@ void ega_poll(void *p)
} else } else
suppress_overscan = 0; suppress_overscan = 0;
xs_temp = x;
ys_temp = ega->lastline - ega->firstline + 1;
if (xs_temp < 64)
xs_temp = 640;
if (ys_temp < 32)
ys_temp = 200;
if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) { if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) {
xsize = xs_temp;
ysize = ys_temp;
if (ega->vres) if (ega->vres)
set_screen_size(xsize + x_add_ex, (ysize << 1) + y_add_ex); set_screen_size(xsize + x_add_ex, (ysize << 1) + y_add_ex);
else else