diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 04a60fcf5..59d99c3fd 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -8,7 +8,7 @@ * * 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, * Fred N. van Kempen, @@ -199,6 +199,9 @@ video_reset(int card) cga_palette = 0; cgapal_rebuild(); + /* Reset the blend. */ + herc_blend = 0; + /* Do not initialize internal cards here. */ if (!(card == VID_NONE) && \ !(card == VID_INTERNAL) && !machines[machine].fixed_gfxcard) { diff --git a/src/video/video.c b/src/video/video.c index 84614122e..ba5cb4ebf 100644 --- a/src/video/video.c +++ b/src/video/video.c @@ -40,7 +40,7 @@ * W = 3 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, * Miran Grca, @@ -106,7 +106,6 @@ int invert_display = 0; int video_grayscale = 0; int video_graytype = 0; static int vid_type; -static unsigned int carry = 0; static const video_timings_t *vid_timings; static uint32_t cga_2_table[16]; @@ -358,9 +357,9 @@ void video_blend(int x, int y) { int xx; - uint32_t pixels32_1, pixels32_2; unsigned int val1, val2; + static unsigned int carry = 0; if (!herc_blend) return;