4200b7

diff --git a/custom.cpp b/custom.cpp
index 91156b3b855aa7743f91a843b6f0842583abfed1..a5ac4d194cab7abb95909642be7377015efcc086 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -6578,7 +6578,6 @@ static void SPRxCTL_1(uae_u16 v, int num, int hpos)
        SPRxCTLPOS (num);
 
 #if SPRITE_DEBUG > 0
-       struct sprite *s = &spr[num];
        if (vpos >= SPRITE_DEBUG_MINY && vpos <= SPRITE_DEBUG_MAXY && (SPRITE_DEBUG & (1 << num))) {
                write_log (_T("%d:%d:SPR%dCTL %04X P=%06X VSTRT=%d VSTOP=%d HSTRT=%d D=%d A=%d CP=%x PC=%x\n"),
                        vpos, hpos, num, v, s->pt, s->vstart, s->vstop, s->xpos, spr[num].dmastate, spr[num].armed, cop_state.ip, M68K_GETPC);

diff --git a/od-win32/ahidsound_new.cpp b/od-win32/ahidsound_new.cpp
index a282391c4b5e0e544159b3415c82d685824533c4..46619ea41958cd5c80de213bbb30133c376d42f3 100644 (file)
--- a/od-win32/ahidsound_new.cpp
+++ b/od-win32/ahidsound_new.cpp
@@ -433,7 +433,7 @@ static uae_u32 gettag (uae_u32 *tagpp, uae_u32 *datap)
                        tagp = data;
                        break;
                case TAG_SKIP:
-                       tagp += data * 8;
+                       tagp += (data + 1) * 8;
                        break;
                default:
                        tagp += 8;

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 79d302d06966be4e515f419da3b8736b65deaa62..94c2086d0683151252be8a56f50421b45ecbe428 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("6")
+#define WINUAEBETA _T("7")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2019, 3, 23)
+#define WINUAEDATE MAKEBD(2019, 3, 29)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 827dbba62599cd0b59f04cce3fe4b6fcae1522c9..612d85bf576147eed860996069227999f3586ddd 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,12 @@
 \r
+Beta 7:\r
+\r
+- ELF executable ROM loader crash fix.\r
+- Borderblank + horizontally bitplane ending before display window end: part of right border was drawn using wrong color (borderblank color vs color 0).\r
+- uaegfx and Picasso IV 8-bit palette overlay mode was not implemented. Fixes XIII/Oxyron PIP mode.\r
+- Fixed uaegfx overlay corruption if allocated overlay bitmap width was not divisible by pixel byte size. (PiP_View + image with "unaligned" width)\r
+- Disassemmbling 68020+ full format extension type (an,dn,xxxx.w/.l) didn't print an part.\r
+\r
 Beta 6:\r
 \r
 - On the fly switching to built-in AROS ROM with low memory config (like basic A500) crashed.\r

diff --git a/scsitape.cpp b/scsitape.cpp
index 5cf36641637dfe2f8baec77c64a9f037ad231c0c..5005b18cad24bd6b2c19b291a2cb5877a2641435 100644 (file)
--- a/scsitape.cpp
+++ b/scsitape.cpp
@@ -16,7 +16,6 @@
 #include "blkdev.h"
 #include "zfile.h"
 #include "memory.h"
-#include "scsi.h"
 #include "threaddep/thread.h"
 #include "a2091.h"
 #include "fsdb.h"