OCS Denise/A1000 Denise first non-blank line update

diff --git a/custom.cpp b/custom.cpp
index a5c917e96a50bdff1ea480c7ccaf5d9ab0596154..2b7bcf652659acdd10605eed1549c739a481bc27 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -6726,6 +6726,11 @@ static void updateextblk(void)
        if (!exthblank) {
                hbstrt_v2 = (8 << CCK_SHRES_SHIFT) - 3;
                hbstop_v2 = (47 << CCK_SHRES_SHIFT) - 7;
+               if (denisea1000) {
+                       hbstop_v2 = (47 << CCK_SHRES_SHIFT) - 7;
+               } else if (!ecs_denise) {
+                       hbstop_v2 = (47 << CCK_SHRES_SHIFT) - 3;
+               }
                hbstrt_v2 = adjust_hr(hbstrt_v2);
                hbstop_v2 = adjust_hr(hbstop_v2);
        }
@@ -6840,9 +6845,7 @@ static void updateextblk(void)
        denisehtotal <<= CCK_SHRES_SHIFT;
 
        // ECS Denise has 1 extra lores pixel in right border
-       if (currprefs.gfx_overscanmode >= OVERSCANMODE_ULTRA) {
-               denisehtotal += 2 << (CCK_SHRES_SHIFT - 1);
-       } else if (ecs_denise) {
+       if (ecs_denise) {
                denisehtotal += 1 << (CCK_SHRES_SHIFT - 1);
        }
 

diff --git a/drawing.cpp b/drawing.cpp
index c9f4b9190ab6a493726f72aef07b77196f3dc359..644b60a89f9bb7f2ce383d8b799ec16c4436e2b1 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -655,6 +655,11 @@ static void set_hblanking_limits(void)
        bool doblank = false;
        int hbstrt = ((maxhpos_short + 8) << CCK_SHRES_SHIFT) - 3;
        int hbstop = (47 << CCK_SHRES_SHIFT) - 7;
+       if (denisea1000) {
+               hbstop = (47 << CCK_SHRES_SHIFT) - 7;
+       } else if (!ecs_denise) {
+               hbstop = (47 << CCK_SHRES_SHIFT) - 3;
+       }
 
        if (currprefs.gfx_overscanmode < OVERSCANMODE_OVERSCAN) {
                int mult = (OVERSCANMODE_OVERSCAN - currprefs.gfx_overscanmode) * 4;