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

A small bugfix for the Hercules blend and a variable move.

Browse Source
This commit is contained in:
OBattler
2018-11-01 10:52:27 +01:00
parent 21235eeac2
commit 14e5c4cc09
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/vid_table.c
View File

@@ -8,7 +8,7 @@
* *
* Define all known video cards. * Define all known video cards.
* *
* Version: @(#)vid_table.c 1.0.41 2018/10/22 * Version: @(#)vid_table.c 1.0.42 2018/11/01
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
@@ -199,6 +199,9 @@ video_reset(int card)
cga_palette = 0; cga_palette = 0;
cgapal_rebuild(); cgapal_rebuild();
/* Reset the blend. */
herc_blend = 0;
/* Do not initialize internal cards here. */ /* Do not initialize internal cards here. */
if (!(card == VID_NONE) && \ if (!(card == VID_NONE) && \
!(card == VID_INTERNAL) && !machines[machine].fixed_gfxcard) { !(card == VID_INTERNAL) && !machines[machine].fixed_gfxcard) {

5
src/video/video.c
View File

@@ -40,7 +40,7 @@
* W = 3 bus clocks * W = 3 bus clocks
* L = 4 bus clocks * L = 4 bus clocks
* *
* Version: @(#)video.c 1.0.30 2018/10/28 * Version: @(#)video.c 1.0.31 2018/11/01
* *
* 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>
@@ -106,7 +106,6 @@ int invert_display = 0;
int video_grayscale = 0; int video_grayscale = 0;
int video_graytype = 0; int video_graytype = 0;
static int vid_type; static int vid_type;
static unsigned int carry = 0;
static const video_timings_t *vid_timings; static const video_timings_t *vid_timings;
static uint32_t cga_2_table[16]; static uint32_t cga_2_table[16];
@@ -358,9 +357,9 @@ void
video_blend(int x, int y) video_blend(int x, int y)
{ {
int xx; int xx;
uint32_t pixels32_1, pixels32_2; uint32_t pixels32_1, pixels32_2;
unsigned int val1, val2; unsigned int val1, val2;
static unsigned int carry = 0;
if (!herc_blend) if (!herc_blend)
return; return;