Better NTSC vertical positioning in normal overscan mode.

diff --git a/include/drawing.h b/include/drawing.h
index 9214106549f411b202153fb7c98af08308de7399..75116633024f86c22b67ee19026cf4a1ebe582e9 100644 (file)
--- a/include/drawing.h
+++ b/include/drawing.h
@@ -28,7 +28,9 @@ extern int detected_screen_resolution;
 extern int hsync_end_left_border, denisehtotal;
 
 #define AMIGA_WIDTH_MAX (754 / 2)
-#define AMIGA_HEIGHT_MAX (576 / 2)
+#define AMIGA_HEIGHT_MAX_PAL (576 / 2)
+#define AMIGA_HEIGHT_MAX_NTSC (484 / 2)
+#define AMIGA_HEIGHT_MAX (AMIGA_HEIGHT_MAX_PAL)
 
 // Cycles * 2 from start of scanline to first refresh slot (hsync strobe slot)
 #define DDF_OFFSET (2 * 4)

diff --git a/od-win32/win32_scaler.cpp b/od-win32/win32_scaler.cpp
index 90fb74ee9c2d9983255d478258361ae661afbd35..7e535d7c052ca8fb32b3d41bb4faadb7dc12aefa 100644 (file)
--- a/od-win32/win32_scaler.cpp
+++ b/od-win32/win32_scaler.cpp
@@ -135,7 +135,7 @@ static void getmanualpos(int monid, int *cxp, int *cyp, int *cwp, int *chp)
                        ch = avidinfo->outbuffer->outheight << (VRES_MAX - currprefs.gfx_vresolution);
                } else if (currprefs.gfx_overscanmode <= OVERSCANMODE_OVERSCAN) {
                        // keep old version compatiblity
-                       ch = native ? AMIGA_HEIGHT_MAX << VRES_MAX : avidinfo->outbuffer->outheight;
+                       ch = native ? (ispal(NULL) ? AMIGA_HEIGHT_MAX_PAL : AMIGA_HEIGHT_MAX_NTSC) << VRES_MAX : avidinfo->outbuffer->outheight;
                } else {
                        ch = native ? (maxvpos_display + maxvpos_display_vsync - minfirstline) << VRES_MAX : avidinfo->outbuffer->outheight;
                }