From: Toni Wilen <twilen@winuae.net>
Date: Fri, 26 May 2023 18:39:56 +0000 (+0300)
Subject: 5000b14
X-Git-Tag: 5.0.0~6
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=871ab6caa4e87beaf6613df2b0968880c68446fc;p=francis%2Fwinuae.git

5000b14
---

diff --git a/custom.cpp b/custom.cpp
index 7dadde6b..322c04a0 100644
--- a/custom.cpp
+++ b/custom.cpp
@@ -7782,17 +7782,18 @@ static void VPOSW(uae_u16 v)
 		v &= 1;
 	}
 	newvpos |= v << 8;
+
 	if (newvpos != oldvpos) {
 		cia_adjust_eclock_phase((newvpos - oldvpos) * maxhpos);
 		vposw_change++;
-	}
 
-	if (newvpos < oldvpos && oldvpos <= maxvpos) {
-		newvpos = oldvpos;
-	}
-	vpos = newvpos;
+		if (newvpos < oldvpos && oldvpos <= maxvpos) {
+			newvpos = oldvpos;
+		}
+		vpos = newvpos;
 
-	vb_check();
+		vb_check();
+	}
 }
 
 static void VHPOSW_delayed(uae_u32 v)
diff --git a/od-win32/win32.h b/od-win32/win32.h
index ed2ed9b5..d2151d76 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -25,13 +25,13 @@
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2023, 5, 23)
+#define WINUAEDATE MAKEBD(2023, 5, 26)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
 
 #ifndef WINUAEEXTRA
-#define WINUAEEXTRA _T("RC5")
+#define WINUAEEXTRA _T("RC6")
 #endif
 #ifndef WINUAEREV
 #define WINUAEREV _T("")
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 5fbb0f51..83169de6 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,12 @@
 
+Beta 14: (RC6)
+
+- "Remove interlace artifacts" + accurate modes: some blitter cycles were also rerun during "scandoubled" line.
+- Added Multi-Player Soccer Manager dongle emulation. This is very similar to Striker Manager dongle.
+- On the fly switch from AGA to OCS/ECS and then back didn't restore original AGA background color until running program wrote different value to COLOR0 register.
+- In some situations refresh conflict (even if it was harmless single cycle conflict due to bitplane DMA being enabled with "bad" position) left sprites in always on horizontal "conflict offset" state. (4.9.9+)
+- Added jit_inhibit config entry, can be used to force disable JIT temporarily even if uae-configuration/custom event is used to enable JIT. When you really want JIT disabled but don't want to modify anything else.
+
 Beta 13: (RC5)
 
 - Sprite buffer overflow was still possible. Adjusted buffer size again and added limit check, if it is still going to overflow, sprite emulation is skipped until next frame. Problem with this buffer is that it is static, it needs to be as big as max supported programmed display mode which is waste of memory when emulating normal PAL/NTSC modes. It needs to be dynamically allocated. But it is too late now. ("Green" Big Time Sensuality / Axis)