From fc611e8636fa63e0946698833bb2ff4677bff87e Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 22 Nov 2025 15:49:45 +0200 Subject: [PATCH] Sprite/bitplane collision update --- drawing.cpp | 27 +- genlinetoscr.cpp | 33 +- linetoscr_ecs_shres.cpp | 96 +++- linetoscr_ocs_ecs.cpp | 784 +++++++++++++++++++++-------- linetoscr_ocs_ecs_genlock.cpp | 320 +++++++++--- linetoscr_ocs_ecs_ntsc.cpp | 784 +++++++++++++++++++++-------- linetoscr_ocs_ecs_ntsc_genlock.cpp | 320 +++++++++--- 7 files changed, 1779 insertions(+), 585 deletions(-) diff --git a/drawing.cpp b/drawing.cpp index 18be3b04..1eae8fd9 100644 --- a/drawing.cpp +++ b/drawing.cpp @@ -426,6 +426,7 @@ struct color_entry denise_colors; static bool bpl1dat_trigger, bpl1dat_copy; static uae_u32 bordercolor, bordercolor_ecs_shres; static int sprites_hidden, sprites_hidden2, sprite_hidden_mask; +static uae_u32 sprite_pixdata; static bool bordersprite, borderblank, bordertrans; static bool bpldat_copy[2]; static int denise_planes, denise_max_planes; @@ -3314,7 +3315,7 @@ static void expand_colmask(void) uae_u8 m = i & clxcon_bpl_enable; uae_u8 odd = m & 0x55; uae_u8 even = m & 0xaa; - if (((odd && even) && m == (clxcon_bpl_enable2 & clxcon_bpl_match2)) || bplalwayson) { + if (m == (clxcon_bpl_enable2 & clxcon_bpl_match2) || bplalwayson) { bplcoltable[i] = 0x0001; } else { bplcoltable[i] = 0x0000; @@ -3439,6 +3440,7 @@ void denise_reset(bool hard) debug_special_csync = currprefs.gfx_overscanmode == OVERSCANMODE_ULTRA + 2; denise_csync_blanken = false; aga_delayed_color_idx = -1; + sprite_pixdata = 0; for (int i = 0; i < 256; i++) { uae_u16 v = 0; if (i & (0x01 | 0x02)) { // 0/1 @@ -4239,7 +4241,7 @@ static uae_u32 decode_pixel(uint8_t pix) } } -static uae_u8 denise_render_sprites2(uae_u8 apixel, uae_u32 vs) +static void denise_collide_sprites(uae_u8 apixel, uae_u32 vs) { uae_u8 c = vs >> 16; uae_u16 v = (uae_u16)vs; @@ -4265,6 +4267,15 @@ static uae_u8 denise_render_sprites2(uae_u8 apixel, uae_u32 vs) } } } +} + +static uae_u8 denise_render_sprites2(uae_u8 apixel, uae_u32 vs) +{ + uae_u8 c = vs >> 16; + uae_u16 v = (uae_u16)vs; + if (currprefs.collision_level) { + denise_collide_sprites(apixel, vs); + } int *shift_lookup = bpldualpf ? (bpldualpfpri ? dblpf_ms2 : dblpf_ms1) : dblpf_ms; int maskshift, plfmask; maskshift = shift_lookup[apixel]; @@ -4674,6 +4685,10 @@ static void do_hstrt_ecs(int cnt) sprites_hidden = sprites_hidden2; last_bpl_pix = 0; setlasthamcolor(); + if (sprite_pixdata) { + // sprite can collide with zero bitplane under the border. OCS/ECS only. + denise_collide_sprites(0, sprite_pixdata); + } } hstrt_offset = internal_pixel_cnt; denise_hdiw = true; @@ -6467,10 +6482,14 @@ static void lts_unaligned_ecs(int cnt, int cnt_next, int h) // sprite rendering uae_u32 sv = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt = denise_render_sprites(); - if (!denise_blank_active && !sprites_hidden) { - sv = svt; + if (!denise_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv = sprite_pixdata; + } } } diff --git a/genlinetoscr.cpp b/genlinetoscr.cpp index 48561222..eab071de 100644 --- a/genlinetoscr.cpp +++ b/genlinetoscr.cpp @@ -352,26 +352,49 @@ static void gen_ecsshresspr(void) outf("}"); } -static void gen_sprpix(int i) +static void gen_sprpix_ecs(int i) { // sprite pixel outf("uae_u32 sv%d = 0;", i); + outf("sprite_pixdata = 0;"); outf("if (denise_spr_nr_armeds) {"); outf(" uae_u32 svt;"); - if (aga) { - // outres > sprres ? 1 << (2 - (outres - sprres)) : 4 - outf(" svt = denise_render_sprites_aga(denise_spr_add);"); - } else if (ecsshres) { + if (ecsshres) { outf(" svt = denise_render_sprites_ecs_shres();"); } else { outf(" svt = denise_render_sprites_lores();"); } + outf(" if (!denise_sprite_blank_active) {"); + outf(" sprite_pixdata = svt;"); + outf(" if (!sprites_hidden) {"); + outf(" sv%d = svt;", i); + outf(" }"); + outf(" }"); + outf("}"); +} + +static void gen_sprpix_aga(int i) +{ + // sprite pixel + outf("uae_u32 sv%d = 0;", i); + outf("if (denise_spr_nr_armeds) {"); + outf(" uae_u32 svt;"); + outf(" svt = denise_render_sprites_aga(denise_spr_add);"); outf(" if (!denise_sprite_blank_active && !sprites_hidden) {"); outf(" sv%d = svt;", i); outf(" }"); outf("}"); } +static void gen_sprpix(int i) +{ + if (aga) { + gen_sprpix_aga(i); + } else { + gen_sprpix_ecs(i); + } +} + static void gen_storepix(int off, int off2) { // ultra extreme debugging blanking raster diff --git a/linetoscr_ecs_shres.cpp b/linetoscr_ecs_shres.cpp index 988a354c..839b5465 100644 --- a/linetoscr_ecs_shres.cpp +++ b/linetoscr_ecs_shres.cpp @@ -44,20 +44,28 @@ static void lts_ecs_shres_dhires(void) } } uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } matchsprites_ecs_shres(cnt + 0); uae_u32 sv1 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv1 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv1 = svt; + } } } matchsprites_ecs_shres(cnt + 2); @@ -158,20 +166,28 @@ static void lts_ecs_shres_dhires_filtered(void) } } uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } matchsprites_ecs_shres(cnt + 0); uae_u32 sv1 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv1 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv1 = svt; + } } } matchsprites_ecs_shres(cnt + 2); @@ -274,20 +290,28 @@ static void lts_ecs_shres_dshres(void) } } uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } matchsprites_ecs_shres(cnt + 0); uae_u32 sv1 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv1 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv1 = svt; + } } } matchsprites_ecs_shres(cnt + 2); @@ -415,20 +439,28 @@ static void lts_ecs_shres_dhires_genlock(void) } } uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } matchsprites_ecs_shres(cnt + 0); uae_u32 sv1 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv1 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv1 = svt; + } } } matchsprites_ecs_shres(cnt + 2); @@ -535,20 +567,28 @@ static void lts_ecs_shres_dhires_genlock_filtered(void) } } uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } matchsprites_ecs_shres(cnt + 0); uae_u32 sv1 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv1 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv1 = svt; + } } } matchsprites_ecs_shres(cnt + 2); @@ -659,20 +699,28 @@ static void lts_ecs_shres_dshres_genlock(void) } } uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } matchsprites_ecs_shres(cnt + 0); uae_u32 sv1 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_ecs_shres(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv1 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv1 = svt; + } } } matchsprites_ecs_shres(cnt + 2); diff --git a/linetoscr_ocs_ecs.cpp b/linetoscr_ocs_ecs.cpp index 30c8ca82..cf365cf3 100644 --- a/linetoscr_ocs_ecs.cpp +++ b/linetoscr_ocs_ecs.cpp @@ -2134,11 +2134,15 @@ static void lts_ecs_fm0_n0_p2_ilores_dlores_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2215,11 +2219,15 @@ static void lts_ecs_fm0_n1_p2_ilores_dlores_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2300,11 +2308,15 @@ static void lts_ecs_fm0_dpf0_p2_ilores_dlores_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2382,11 +2394,15 @@ static void lts_ecs_fm0_dpf1_p2_ilores_dlores_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2690,11 +2706,15 @@ static void lts_ecs_fm0_n0_p4_ilores_dlores_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2771,11 +2791,15 @@ static void lts_ecs_fm0_n1_p4_ilores_dlores_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2856,11 +2880,15 @@ static void lts_ecs_fm0_dpf0_p4_ilores_dlores_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2938,11 +2966,15 @@ static void lts_ecs_fm0_dpf1_p4_ilores_dlores_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3249,11 +3281,15 @@ static void lts_ecs_fm0_n0_p5_ilores_dlores_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3333,11 +3369,15 @@ static void lts_ecs_fm0_n1_p5_ilores_dlores_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3421,11 +3461,15 @@ static void lts_ecs_fm0_dpf0_p5_ilores_dlores_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3506,11 +3550,15 @@ static void lts_ecs_fm0_dpf1_p5_ilores_dlores_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3705,11 +3753,15 @@ static void lts_ecs_fm0_ham0_p5_ilores_dlores_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3789,11 +3841,15 @@ static void lts_ecs_fm0_ham1_p5_ilores_dlores_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3876,11 +3932,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dlores_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3960,11 +4020,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dlores_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4048,11 +4112,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dlores_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4133,11 +4201,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dlores_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4225,11 +4297,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dlores_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4314,11 +4390,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dlores_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4401,11 +4481,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dlores_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4485,11 +4569,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dlores_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -8625,11 +8713,15 @@ static void lts_ecs_fm0_n0_p2_ihires_dlores_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -8715,11 +8807,15 @@ static void lts_ecs_fm0_n0_p2_ihires_dlores_spr_filtered(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -8807,11 +8903,15 @@ static void lts_ecs_fm0_n1_p2_ihires_dlores_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -8900,11 +9000,15 @@ static void lts_ecs_fm0_n1_p2_ihires_dlores_spr_filtered(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -8996,11 +9100,15 @@ static void lts_ecs_fm0_dpf0_p2_ihires_dlores_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9088,11 +9196,15 @@ static void lts_ecs_fm0_dpf0_p2_ihires_dlores_spr_filtered(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9182,11 +9294,15 @@ static void lts_ecs_fm0_dpf1_p2_ihires_dlores_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9277,11 +9393,15 @@ static void lts_ecs_fm0_dpf1_p2_ihires_dlores_spr_filtered(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9841,11 +9961,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dlores_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9931,11 +10055,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dlores_spr_filtered(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10023,11 +10151,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dlores_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10116,11 +10248,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dlores_spr_filtered(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10212,11 +10348,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dlores_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10304,11 +10444,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dlores_spr_filtered(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10398,11 +10542,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dlores_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10493,11 +10641,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dlores_spr_filtered(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -15482,11 +15634,15 @@ static void lts_ecs_fm0_n0_p2_ilores_dhires_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -15578,11 +15734,15 @@ static void lts_ecs_fm0_n1_p2_ilores_dhires_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -15678,11 +15838,15 @@ static void lts_ecs_fm0_dpf0_p2_ilores_dhires_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -15775,11 +15939,15 @@ static void lts_ecs_fm0_dpf1_p2_ilores_dhires_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16154,11 +16322,15 @@ static void lts_ecs_fm0_n0_p4_ilores_dhires_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16250,11 +16422,15 @@ static void lts_ecs_fm0_n1_p4_ilores_dhires_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16350,11 +16526,15 @@ static void lts_ecs_fm0_dpf0_p4_ilores_dhires_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16447,11 +16627,15 @@ static void lts_ecs_fm0_dpf1_p4_ilores_dhires_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16829,11 +17013,15 @@ static void lts_ecs_fm0_n0_p5_ilores_dhires_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16928,11 +17116,15 @@ static void lts_ecs_fm0_n1_p5_ilores_dhires_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17031,11 +17223,15 @@ static void lts_ecs_fm0_dpf0_p5_ilores_dhires_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17131,11 +17327,15 @@ static void lts_ecs_fm0_dpf1_p5_ilores_dhires_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17373,11 +17573,15 @@ static void lts_ecs_fm0_ham0_p5_ilores_dhires_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17472,11 +17676,15 @@ static void lts_ecs_fm0_ham1_p5_ilores_dhires_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17574,11 +17782,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dhires_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17673,11 +17885,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dhires_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17776,11 +17992,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dhires_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17876,11 +18096,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dhires_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17983,11 +18207,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dhires_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18087,11 +18315,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dhires_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18189,11 +18421,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dhires_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18288,11 +18524,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dhires_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -20879,11 +21119,15 @@ static void lts_ecs_fm0_n0_p2_ihires_dhires_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -20991,11 +21235,15 @@ static void lts_ecs_fm0_n1_p2_ihires_dhires_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21107,11 +21355,15 @@ static void lts_ecs_fm0_dpf0_p2_ihires_dhires_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21221,11 +21473,15 @@ static void lts_ecs_fm0_dpf1_p2_ihires_dhires_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21629,11 +21885,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dhires_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21741,11 +22001,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dhires_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21857,11 +22121,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dhires_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21971,11 +22239,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dhires_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -26996,11 +27268,15 @@ static void lts_ecs_fm0_n0_p2_ilores_dshres_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -27122,11 +27398,15 @@ static void lts_ecs_fm0_n1_p2_ilores_dshres_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -27252,11 +27532,15 @@ static void lts_ecs_fm0_dpf0_p2_ilores_dshres_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -27379,11 +27663,15 @@ static void lts_ecs_fm0_dpf1_p2_ilores_dshres_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -27900,11 +28188,15 @@ static void lts_ecs_fm0_n0_p4_ilores_dshres_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28026,11 +28318,15 @@ static void lts_ecs_fm0_n1_p4_ilores_dshres_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28156,11 +28452,15 @@ static void lts_ecs_fm0_dpf0_p4_ilores_dshres_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28283,11 +28583,15 @@ static void lts_ecs_fm0_dpf1_p4_ilores_dshres_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28807,11 +29111,15 @@ static void lts_ecs_fm0_n0_p5_ilores_dshres_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28936,11 +29244,15 @@ static void lts_ecs_fm0_n1_p5_ilores_dshres_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29069,11 +29381,15 @@ static void lts_ecs_fm0_dpf0_p5_ilores_dshres_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29199,11 +29515,15 @@ static void lts_ecs_fm0_dpf1_p5_ilores_dshres_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29527,11 +29847,15 @@ static void lts_ecs_fm0_ham0_p5_ilores_dshres_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29656,11 +29980,15 @@ static void lts_ecs_fm0_ham1_p5_ilores_dshres_spr(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29788,11 +30116,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dshres_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29917,11 +30249,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dshres_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30050,11 +30386,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dshres_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30180,11 +30520,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dshres_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30317,11 +30661,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dshres_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30451,11 +30799,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dshres_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30583,11 +30935,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dshres_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30712,11 +31068,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dshres_spr(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -34229,11 +34589,15 @@ static void lts_ecs_fm0_n0_p2_ihires_dshres_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -34383,11 +34747,15 @@ static void lts_ecs_fm0_n1_p2_ihires_dshres_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -34541,11 +34909,15 @@ static void lts_ecs_fm0_dpf0_p2_ihires_dshres_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -34697,11 +35069,15 @@ static void lts_ecs_fm0_dpf1_p2_ihires_dshres_spr(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -35259,11 +35635,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dshres_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -35413,11 +35793,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dshres_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -35571,11 +35955,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dshres_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -35727,11 +36115,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dshres_spr(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; diff --git a/linetoscr_ocs_ecs_genlock.cpp b/linetoscr_ocs_ecs_genlock.cpp index 7e3b230a..bc2d5a10 100644 --- a/linetoscr_ocs_ecs_genlock.cpp +++ b/linetoscr_ocs_ecs_genlock.cpp @@ -643,11 +643,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dlores_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -733,11 +737,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dlores_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -827,11 +835,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dlores_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -918,11 +930,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dlores_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -1016,11 +1032,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dlores_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -1111,11 +1131,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dlores_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -1204,11 +1228,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dlores_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -1294,11 +1322,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dlores_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2580,11 +2612,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dlores_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -2679,11 +2715,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dlores_spr_filtered_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -2781,11 +2821,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dlores_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -2883,11 +2927,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dlores_spr_filtered_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -2989,11 +3037,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dlores_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -3090,11 +3142,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dlores_spr_filtered_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -3194,11 +3250,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dlores_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -3298,11 +3358,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dlores_spr_filtered_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -4655,11 +4719,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dhires_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -4762,11 +4830,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dhires_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -4873,11 +4945,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dhires_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -4981,11 +5057,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dhires_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5096,11 +5176,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dhires_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5208,11 +5292,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dhires_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5318,11 +5406,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dhires_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5425,11 +5517,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dhires_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -6250,11 +6346,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dhires_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -6374,11 +6474,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dhires_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -6502,11 +6606,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dhires_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -6628,11 +6736,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dhires_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -8067,11 +8179,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dshres_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8208,11 +8324,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dshres_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8353,11 +8473,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dshres_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8495,11 +8619,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dshres_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8644,11 +8772,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dshres_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8790,11 +8922,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dshres_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8934,11 +9070,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dshres_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -9075,11 +9215,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dshres_spr_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -10190,11 +10334,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dshres_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -10364,11 +10512,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dshres_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -10542,11 +10694,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dshres_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -10718,11 +10874,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dshres_spr_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; diff --git a/linetoscr_ocs_ecs_ntsc.cpp b/linetoscr_ocs_ecs_ntsc.cpp index d5f710db..fa36f495 100644 --- a/linetoscr_ocs_ecs_ntsc.cpp +++ b/linetoscr_ocs_ecs_ntsc.cpp @@ -2166,11 +2166,15 @@ static void lts_ecs_fm0_n0_p2_ilores_dlores_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2248,11 +2252,15 @@ static void lts_ecs_fm0_n1_p2_ilores_dlores_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2334,11 +2342,15 @@ static void lts_ecs_fm0_dpf0_p2_ilores_dlores_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2417,11 +2429,15 @@ static void lts_ecs_fm0_dpf1_p2_ilores_dlores_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2730,11 +2746,15 @@ static void lts_ecs_fm0_n0_p4_ilores_dlores_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2812,11 +2832,15 @@ static void lts_ecs_fm0_n1_p4_ilores_dlores_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2898,11 +2922,15 @@ static void lts_ecs_fm0_dpf0_p4_ilores_dlores_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2981,11 +3009,15 @@ static void lts_ecs_fm0_dpf1_p4_ilores_dlores_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3297,11 +3329,15 @@ static void lts_ecs_fm0_n0_p5_ilores_dlores_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3382,11 +3418,15 @@ static void lts_ecs_fm0_n1_p5_ilores_dlores_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3471,11 +3511,15 @@ static void lts_ecs_fm0_dpf0_p5_ilores_dlores_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3557,11 +3601,15 @@ static void lts_ecs_fm0_dpf1_p5_ilores_dlores_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3759,11 +3807,15 @@ static void lts_ecs_fm0_ham0_p5_ilores_dlores_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3844,11 +3896,15 @@ static void lts_ecs_fm0_ham1_p5_ilores_dlores_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -3932,11 +3988,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dlores_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4017,11 +4077,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dlores_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4106,11 +4170,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dlores_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4192,11 +4260,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dlores_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4285,11 +4357,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dlores_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4375,11 +4451,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dlores_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4463,11 +4543,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dlores_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -4548,11 +4632,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dlores_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -8753,11 +8841,15 @@ static void lts_ecs_fm0_n0_p2_ihires_dlores_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -8844,11 +8936,15 @@ static void lts_ecs_fm0_n0_p2_ihires_dlores_spr_ntsc_filtered(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -8937,11 +9033,15 @@ static void lts_ecs_fm0_n1_p2_ihires_dlores_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9031,11 +9131,15 @@ static void lts_ecs_fm0_n1_p2_ihires_dlores_spr_ntsc_filtered(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9128,11 +9232,15 @@ static void lts_ecs_fm0_dpf0_p2_ihires_dlores_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9221,11 +9329,15 @@ static void lts_ecs_fm0_dpf0_p2_ihires_dlores_spr_ntsc_filtered(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9316,11 +9428,15 @@ static void lts_ecs_fm0_dpf1_p2_ihires_dlores_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9412,11 +9528,15 @@ static void lts_ecs_fm0_dpf1_p2_ihires_dlores_spr_ntsc_filtered(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -9985,11 +10105,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dlores_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10076,11 +10200,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dlores_spr_ntsc_filtered(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10169,11 +10297,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dlores_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10263,11 +10395,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dlores_spr_ntsc_filtered(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10360,11 +10496,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dlores_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10453,11 +10593,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dlores_spr_ntsc_filtered(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10548,11 +10692,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dlores_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -10644,11 +10792,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dlores_spr_ntsc_filtered(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -15738,11 +15890,15 @@ static void lts_ecs_fm0_n0_p2_ilores_dhires_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -15836,11 +15992,15 @@ static void lts_ecs_fm0_n1_p2_ilores_dhires_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -15938,11 +16098,15 @@ static void lts_ecs_fm0_dpf0_p2_ilores_dhires_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16037,11 +16201,15 @@ static void lts_ecs_fm0_dpf1_p2_ilores_dhires_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16426,11 +16594,15 @@ static void lts_ecs_fm0_n0_p4_ilores_dhires_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16524,11 +16696,15 @@ static void lts_ecs_fm0_n1_p4_ilores_dhires_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16626,11 +16802,15 @@ static void lts_ecs_fm0_dpf0_p4_ilores_dhires_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -16725,11 +16905,15 @@ static void lts_ecs_fm0_dpf1_p4_ilores_dhires_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17117,11 +17301,15 @@ static void lts_ecs_fm0_n0_p5_ilores_dhires_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17218,11 +17406,15 @@ static void lts_ecs_fm0_n1_p5_ilores_dhires_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17323,11 +17515,15 @@ static void lts_ecs_fm0_dpf0_p5_ilores_dhires_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17425,11 +17621,15 @@ static void lts_ecs_fm0_dpf1_p5_ilores_dhires_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17673,11 +17873,15 @@ static void lts_ecs_fm0_ham0_p5_ilores_dhires_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17774,11 +17978,15 @@ static void lts_ecs_fm0_ham1_p5_ilores_dhires_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17878,11 +18086,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dhires_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -17979,11 +18191,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dhires_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18084,11 +18300,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dhires_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18186,11 +18406,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dhires_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18295,11 +18519,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dhires_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18401,11 +18629,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dhires_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18505,11 +18737,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dhires_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -18606,11 +18842,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dhires_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21263,11 +21503,15 @@ static void lts_ecs_fm0_n0_p2_ihires_dhires_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21377,11 +21621,15 @@ static void lts_ecs_fm0_n1_p2_ihires_dhires_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21495,11 +21743,15 @@ static void lts_ecs_fm0_dpf0_p2_ihires_dhires_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -21611,11 +21863,15 @@ static void lts_ecs_fm0_dpf1_p2_ihires_dhires_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -22029,11 +22285,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dhires_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -22143,11 +22403,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dhires_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -22261,11 +22525,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dhires_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -22377,11 +22645,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dhires_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -27572,11 +27844,15 @@ static void lts_ecs_fm0_n0_p2_ilores_dshres_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -27702,11 +27978,15 @@ static void lts_ecs_fm0_n1_p2_ilores_dshres_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -27836,11 +28116,15 @@ static void lts_ecs_fm0_dpf0_p2_ilores_dshres_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -27967,11 +28251,15 @@ static void lts_ecs_fm0_dpf1_p2_ilores_dshres_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28508,11 +28796,15 @@ static void lts_ecs_fm0_n0_p4_ilores_dshres_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28638,11 +28930,15 @@ static void lts_ecs_fm0_n1_p4_ilores_dshres_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28772,11 +29068,15 @@ static void lts_ecs_fm0_dpf0_p4_ilores_dshres_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -28903,11 +29203,15 @@ static void lts_ecs_fm0_dpf1_p4_ilores_dshres_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29447,11 +29751,15 @@ static void lts_ecs_fm0_n0_p5_ilores_dshres_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29580,11 +29888,15 @@ static void lts_ecs_fm0_n1_p5_ilores_dshres_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29717,11 +30029,15 @@ static void lts_ecs_fm0_dpf0_p5_ilores_dshres_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -29851,11 +30167,15 @@ static void lts_ecs_fm0_dpf1_p5_ilores_dshres_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30191,11 +30511,15 @@ static void lts_ecs_fm0_ham0_p5_ilores_dshres_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30324,11 +30648,15 @@ static void lts_ecs_fm0_ham1_p5_ilores_dshres_spr_ntsc(void) } shiftbpl5(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30460,11 +30788,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dshres_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30593,11 +30925,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dshres_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30730,11 +31066,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dshres_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -30864,11 +31204,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dshres_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -31005,11 +31349,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dshres_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -31143,11 +31491,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dshres_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -31279,11 +31631,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dshres_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -31412,11 +31768,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dshres_spr_ntsc(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -35061,11 +35421,15 @@ static void lts_ecs_fm0_n0_p2_ihires_dshres_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -35219,11 +35583,15 @@ static void lts_ecs_fm0_n1_p2_ihires_dshres_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -35381,11 +35749,15 @@ static void lts_ecs_fm0_dpf0_p2_ihires_dshres_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -35541,11 +35913,15 @@ static void lts_ecs_fm0_dpf1_p2_ihires_dshres_spr_ntsc(void) } shiftbpl2(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -36123,11 +36499,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dshres_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -36281,11 +36661,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dshres_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -36443,11 +36827,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dshres_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -36603,11 +36991,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dshres_spr_ntsc(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; diff --git a/linetoscr_ocs_ecs_ntsc_genlock.cpp b/linetoscr_ocs_ecs_ntsc_genlock.cpp index 5cde5a51..930e960a 100644 --- a/linetoscr_ocs_ecs_ntsc_genlock.cpp +++ b/linetoscr_ocs_ecs_ntsc_genlock.cpp @@ -659,11 +659,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dlores_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -751,11 +755,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dlores_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -847,11 +855,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dlores_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -940,11 +952,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dlores_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -1040,11 +1056,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dlores_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -1137,11 +1157,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dlores_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -1232,11 +1256,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dlores_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -1324,11 +1352,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dlores_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 4; @@ -2644,11 +2676,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dlores_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -2745,11 +2781,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dlores_spr_ntsc_filtered_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -2849,11 +2889,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dlores_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -2953,11 +2997,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dlores_spr_ntsc_filtered_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -3061,11 +3109,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dlores_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -3164,11 +3216,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dlores_spr_ntsc_filtered_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -3270,11 +3326,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dlores_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -3376,11 +3436,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dlores_spr_ntsc_filtered_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -4783,11 +4847,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dhires_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -4894,11 +4962,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dhires_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5009,11 +5081,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dhires_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5121,11 +5197,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dhires_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5240,11 +5320,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dhires_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5356,11 +5440,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dhires_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5470,11 +5558,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dhires_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -5581,11 +5673,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dhires_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -6442,11 +6538,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dhires_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -6570,11 +6670,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dhires_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -6702,11 +6806,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dhires_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -6832,11 +6940,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dhires_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 2; @@ -8355,11 +8467,15 @@ static void lts_ecs_fm0_n0_p6_ilores_dshres_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8504,11 +8620,15 @@ static void lts_ecs_fm0_n1_p6_ilores_dshres_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8657,11 +8777,15 @@ static void lts_ecs_fm0_dpf0_p6_ilores_dshres_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8807,11 +8931,15 @@ static void lts_ecs_fm0_dpf1_p6_ilores_dshres_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -8964,11 +9092,15 @@ static void lts_ecs_fm0_ehb0_p6_ilores_dshres_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -9118,11 +9250,15 @@ static void lts_ecs_fm0_ehb1_p6_ilores_dshres_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -9270,11 +9406,15 @@ static void lts_ecs_fm0_ham0_p6_ilores_dshres_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -9419,11 +9559,15 @@ static void lts_ecs_fm0_ham1_p6_ilores_dshres_spr_ntsc_genlock(void) } shiftbpl6(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -10606,11 +10750,15 @@ static void lts_ecs_fm0_n0_p4_ihires_dshres_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -10788,11 +10936,15 @@ static void lts_ecs_fm0_n1_p4_ihires_dshres_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -10974,11 +11126,15 @@ static void lts_ecs_fm0_dpf0_p4_ihires_dshres_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; @@ -11158,11 +11314,15 @@ static void lts_ecs_fm0_dpf1_p4_ihires_dshres_spr_ntsc_genlock(void) } shiftbpl4(); uae_u32 sv0 = 0; + sprite_pixdata = 0; if (denise_spr_nr_armeds) { uae_u32 svt; svt = denise_render_sprites_lores(); - if (!denise_sprite_blank_active && !sprites_hidden) { - sv0 = svt; + if (!denise_sprite_blank_active) { + sprite_pixdata = svt; + if (!sprites_hidden) { + sv0 = svt; + } } } internal_pixel_cnt += 1; -- 2.47.3