Check overrun even if whole line is emulated in single pass. Check for extremely...

diff --git a/custom.cpp b/custom.cpp
index 930fa761a3c461c12db5c721c5aa32f5a33de744..30e726fccebda8f10e3f20aefa462237ac46871c 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -1301,8 +1301,9 @@ static void update_toscr_planes (int fm)
 
 STATIC_INLINE void maybe_first_bpl1dat (int hpos)
 {
-       if (thisline_decision.plfleft < 0)
+       if (thisline_decision.plfleft < 0) {
                thisline_decision.plfleft = hpos;
+       }
 }
 
 static int fetch_warn (int nr, int hpos)
@@ -2364,6 +2365,9 @@ static void finish_final_fetch (void)
        
        // This is really the end of scanline, we can finally flush all remaining data.
        thisline_decision.plfright += flush_plane_data (fetchmode);
+       // This can overflow if display setup is really bad.
+       if (out_offs > MAX_PIXELS_PER_LINE / 32)
+               out_offs = MAX_PIXELS_PER_LINE / 32;
        thisline_decision.plflinelen = out_offs;
 
        finish_playfield_line ();
@@ -2740,7 +2744,7 @@ static void decide_fetch (int hpos)
 
 STATIC_INLINE void decide_fetch_safe (int hpos)
 {
-       if (!blitter_dangerous_bpl) {
+       if (!blitter_dangerous_bpl && !bitplane_overrun) {
                decide_fetch (hpos);
                decide_blitter (hpos);
        } else {
@@ -3700,6 +3704,10 @@ static void finish_decisions (void)
        if (nodraw ())
                return;
 
+       // if overrun at the beginning of scanline was not handled: do it here first.
+       if (bitplane_overrun) {
+               do_overrun_fetch(hpos, fetchmode);
+       }
        decide_diw (hpos);
        decide_line (hpos);
        decide_fetch_safe (hpos);

diff --git a/drawing.cpp b/drawing.cpp
index fd88ac3b42f10d9dabbea84fa0eda750ddd884e6..734a4aceb58bfb89dbf1c298b2bc277b2a1e3361 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -1002,6 +1002,8 @@ static void pfield_init_linetoscr (bool border)
 
        /* Now, compute some offsets.  */
        ddf_left -= DISPLAY_LEFT_SHIFT;
+       if (ddf_left < 0)
+               ddf_left = 0;
        pixels_offset = MAX_PIXELS_PER_LINE - (ddf_left << bplres);
        ddf_left <<= bplres;
 
@@ -1033,8 +1035,11 @@ static void pfield_init_linetoscr (bool border)
        if (linetoscr_diw_end > native_ddf_right) {
                int pos = res_shift_from_window (native_ddf_right - native_ddf_left);
                int size = res_shift_from_window (linetoscr_diw_end - native_ddf_right);
+               if (pos + size > MAX_PIXELS_PER_LINE)
+                       size = MAX_PIXELS_PER_LINE - pos;
+               if (size > 0)
+                       memset (pixdata.apixels + MAX_PIXELS_PER_LINE + pos, 0, size);
                linetoscr_diw_start = native_ddf_left;
-               memset (pixdata.apixels + MAX_PIXELS_PER_LINE + pos, 0, size);
        }
 }
 
@@ -1048,7 +1053,10 @@ static void pfield_erase_hborder_sprites (void)
        if (sprite_last_x > native_ddf_right) {
                int pos = res_shift_from_window (native_ddf_right - native_ddf_left);
                int size = res_shift_from_window (sprite_last_x - native_ddf_right);
-               memset (pixdata.apixels + MAX_PIXELS_PER_LINE + pos, 0, size);
+               if (pos + size > MAX_PIXELS_PER_LINE)
+                       size = MAX_PIXELS_PER_LINE - pos;
+               if (size > 0)
+                       memset (pixdata.apixels + MAX_PIXELS_PER_LINE + pos, 0, size);
        }
 }