Merge remote-tracking branch 'origin/main' into debugger-start

theblacklotus · Feb 15, 2024 · 98d75a1 · 98d75a1
2 parents b5555bf + 741ee54
commit 98d75a1
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 95 deletions.
diff --git a/uae_src/drawing.cpp b/uae_src/drawing.cpp
@@ -539,7 +539,9 @@ static void get_vblanking_limits(int *vbstrtp, int *vbstopp, bool overscanonly)
 	}
 	int vbstop = maxvpos + lof_display;
 	if (!ecs_denise && !ecs_agnus) {
-		vbstop++;
+		if (currprefs.gfx_overscanmode >= OVERSCANMODE_BROADCAST) {
+			vbstop++;
+		}
 	} else if (ecs_agnus && !ecs_denise) {
 		// hide hblank bug by faking vblank start 1 line earlier
 		if (currprefs.gfx_overscanmode < OVERSCANMODE_BROADCAST) {

diff --git a/uae_src/od-win32/win32.h b/uae_src/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("9")
+#define WINUAEBETA _T("")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2024, 2, 12)
+#define WINUAEDATE MAKEBD(2024, 2, 15)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")