5200b6

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 4f6296fafe5fcebb087abc638484a89acf82e829..35e48eac9d7baea476f597ba76860a7f45df3b3c 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -2091,7 +2091,7 @@ BEGIN
     IDS_QS_MODEL_A3000      "1.4 ROM, 2MB Chip + 8MB Fast\n\n2.04 ROM, 2MB Chip + 8MB Fast\n\n3.1 ROM, 2MB Chip + 8MB Fast\n"
     IDS_QS_MODEL_A4000      "68030, 3.1 ROM, 2MB Chip + 8MB Fast\n\n68040, 3.1 ROM, 2MB Chip + 8MB Fast\n\nCyberStorm PPC\n"
     IDS_QS_MODEL_A4000T     "A4000T (test)\nA4000T\n"
-    IDS_QS_MODEL_MACROSYSTEM "DraCo\n\nCasablanca\n"
+    IDS_QS_MODEL_MACROSYSTEM "DraCo\n\nCasablanca (Video hardware unimplemented)\n"
     IDS_QS_MODEL_ALG        "American Laser Games\n"
 END
 

diff --git a/od-win32/win32.h b/od-win32/win32.h
index c3964f54a617d6fc4d120ff137094d89eb457ad3..1f5cf9976206df6c92b667854ada3cec0c5431e6 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("5")
+#define WINUAEBETA _T("6")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2024, 1, 23)
+#define WINUAEDATE MAKEBD(2024, 1, 27)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index ab386bf2b22deaafb6e76d1c7feb875e49829b33..4a4e73d2c0f036c30965a910bf3bc42f769971b0 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,15 @@
 
 
+Beta 6:
+
+- DraCo NVRAM data was always written to NVRAM file, even if current config was not DraCo.
+- Mad Dog McCree v1C (ALG) Holster input event supported. For some reason it is connected to joystick fire button in this version (First ALG game?). No other ALG game use fire button.
+- If BLTCON0L is written to when blitter is running, don't do unnecessary blitter state checks. BLTCON0L writes are always safe.
+- Executable in DF0: didn't anymore automatically enable turbo floppy mode. Broke when turbo was switched off if program does weird disk DMAs.
+- RTG panel aspect ratio setting and Filter (RTG) aspect ratio was not forced to have same values and they work differently in different filter modes, probably resulting weird aspect ratios in some filter modes. Now updated value is automatically copied to other setting.
+- Hardware emulated board cached size settings was not always updated, especially if mode was switched multiple times quickly. Result was display with wrong scaling or positioning.
+- Sprite horizontal multiplexing (Copper SPRxCTL/POS/DATx mid-screen writes) was unreliable in non-CE modes. (5.1)
+
 Beta 5:
 
 - Registry/ini ROM paths and history list paths (last used ADFs, statefiles etc) are now properly converted to absolute/relative paths when new entry is added.

diff --git a/rommgr.cpp b/rommgr.cpp
index cf4acc7518467a7ce9354233b3e84bad8f8a57fd..89c113f500ab7de48e35e6fc459552bb14962ecc 100644 (file)
--- a/rommgr.cpp
+++ b/rommgr.cpp
@@ -1978,7 +1978,7 @@ static void alg_descramble(struct romdata *rd, uae_u8 *buf, int size)
                if (tmp) {
                        memcpy(tmp, buf, size);
                        static const int sp[] = { 33,32,34,35,49,48,50,51,45,44,46,47,61,60,62,63,37,36,38,39,53,52,54,55,41,40,42,43,57,56,58,59,
-                       33,32,34,35,49,48,50,51,45,44,46,47,61,60,62,63,37,36,38,39,53,52,54,55,41,40,42,43,57,56,58,59 };
+                                                                         33,32,34,35,49,48,50,51,45,44,46,47,61,60,62,63,37,36,38,39,53,52,54,55,41,40,42,43,57,56,58,59 };
                        for (int i = 0; i < 64; i++) {
                                memcpy(buf + i * 0x1000, tmp + sp[i] * 0x1000, 0x1000);
                        }