From 6ff967d1c2cc595e9e4d0ca882f8fa7da14666e5 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Tue, 23 Jan 2024 20:57:14 +0200 Subject: [PATCH] 5200b5 --- memory.cpp | 6 +++--- od-win32/resources/winuae.rc | 4 ++-- od-win32/win32.h | 4 ++-- od-win32/winuaechangelog.txt | 13 +++++++++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/memory.cpp b/memory.cpp index 3dbf7d31..e9403da1 100644 --- a/memory.cpp +++ b/memory.cpp @@ -2672,7 +2672,7 @@ static void fill_ce_banks (void) } if (currprefs.address_space_24) { - for (i = 1; i < 256; i++) + for (i = 1; i < MEMORY_BANKS_24; i++) memcpy(&ce_banktype[i * 256], &ce_banktype[0], 256); } @@ -3452,7 +3452,7 @@ static void map_banks2 (addrbank *bank, int start, int size, int realsize, int q } #ifndef ADDRESS_SPACE_24BIT - if (start >= 0x100) { + if (start >= MEMORY_BANKS_24) { int real_left = 0; for (bnr = start; bnr < start + size; bnr++) { if (!real_left) { @@ -3580,7 +3580,7 @@ void map_banks (addrbank *bank, int start, int size, int realsize) } #endif - if (start >= 0x100) { + if (start >= MEMORY_BANKS_24) { int real_left = 0; for (int bnr = start; bnr < start + size; bnr++) { highram_temp_bank[bnr - 0x100] = bank; diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index b55562fd..4f6296fa 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -2044,8 +2044,8 @@ BEGIN IDS_NUMSG_KS68020 "The selected system ROM requires a 68020 with 32-bit addressing or 68030 or higher CPU." IDS_NUMSG_ROMNEED "One of the following system ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs." IDS_NUMSG_STATEHD "WARNING: Current configuration is not fully compatible with state saves.\nThis message will not appear again." - IDS_NUMSG_NOCAPS "Selected disk image needs the SPS plugin\nwhich is available from\nhttp//www.softpres.org/" - IDS_NUMSG_OLDCAPS "You need an updated SPS plugin\nwhich is available from\nhttp//www.softpres.org/" + IDS_NUMSG_NOCAPS "Selected disk image needs the SPS plugin\nwhich is available from\nhttp://www.softpres.org/" + IDS_NUMSG_OLDCAPS "You need an updated SPS plugin\nwhich is available from\nhttp://www.softpres.org/" IDS_IMGCHK_BOOTBLOCKCRCERROR "The selected floppy disk image is not bootable (boot block checksum error)" IDS_IMGCHK_BOOTBLOCKNO "The selected floppy disk image is not bootable (no boot block)" diff --git a/od-win32/win32.h b/od-win32/win32.h index d26eb2ce..c3964f54 100644 --- 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("4") +#define WINUAEBETA _T("5") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2024, 1, 14) +#define WINUAEDATE MAKEBD(2024, 1, 23) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 9b996c7c..ab386bf2 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,17 @@ + +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. +- Loading config with statefile config entry set: insert statefile in to statefile history list. +- Topmost line was missing in OSD status line texts ("DF0: -" etc) in some font settings. +- 5.1 b1 "Allow AUDxPER=1, game Spaceport requires it" adjusted, force period to higher value when sample loops (not immediately like pre-5.1 did). This keeps Spaceport happy without causing some other weird programs to slow down emulation very noticeably by "playing" period=1 empty sample continuously, all 4 channels. (For example during loading of Bad Dudes vs. Dragon Ninja) +- Added S3 Trio64 PCI RTG board (Uses same chip emulation as CyberVision64) +- Ateo Pixel 64 had BGR/RGB swapped colors in most color depths. +- Sound autoswitching is now off by default (default off when no config file loaded). Some sound devices have annoying audible pop when sound gets switched off or on. +- RTG modes allocated unnecessarily too large texture (size of whole viewport, not only actual RTG area). Broke in some 5.0 betas. This was harmless except it also caused uaegfx to not clip hardware mouse cursor in right and bottom edges and possibly broke some filters. +- Fixed mouse cursor jumping randomly when in tablet mode and clicking mouse button(s). + Beta 4: - Changing OSD font when in full-window or fullscreen mode saved it incorrectly and nothing changed. -- 2.47.3