OCS Denise NTSC overscan/overscan+ fix

diff --git a/drawing.cpp b/drawing.cpp
index c8f00ebf93d6590b9108fec04fbc01ef77147baa..990abfd45c83066ab9054aa2615722761f33f596 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -5728,6 +5728,8 @@ static void get_line(int monid, int gfx_ypos, enum nln_how how, int lol_shift_pr
                denise_pixtotal -= xshift;
        }
 
+       denise_pixtotal *= 2;
+
        buf1 = (uae_u32*)xlinebuffer;
        if (!xlinebuffer2) {
                xlinebuffer2 = xlinebuffer;
@@ -5756,10 +5758,11 @@ static void get_line(int monid, int gfx_ypos, enum nln_how how, int lol_shift_pr
                                }
                        }
                }
+               if (denise_strlong_seen && currprefs.gfx_overscanmode < OVERSCANMODE_EXTREME && !ecs_denise) {
+                       int size = currprefs.gfx_overscanmode <= OVERSCANMODE_OVERSCAN ? 2 : 1;
+                       denise_pixtotal -= 4 * size;
+               }
        }
-       
-       denise_pixtotal_max--;
-       denise_pixtotal *= 2;
 
        if (buf1) {
                int maxw = addrdiff((uae_u32*)xlinebuffer_end, buf1);