From: Toni Wilen <twilen@winuae.net>
Date: Fri, 29 Mar 2019 17:50:50 +0000 (+0200)
Subject: 4200b7
X-Git-Tag: 4200~7
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=a93c93e896935ec32107e61eda24d049aa78c9ff;p=francis%2Fwinuae.git

4200b7
---

diff --git a/custom.cpp b/custom.cpp
index 91156b3b..a5ac4d19 100644
--- 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 a282391c..46619ea4 100644
--- 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 79d302d0..94c2086d 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("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 827dbba6..612d85bf 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,12 @@
 
+Beta 7:
+
+- ELF executable ROM loader crash fix.
+- Borderblank + horizontally bitplane ending before display window end: part of right border was drawn using wrong color (borderblank color vs color 0).
+- uaegfx and Picasso IV 8-bit palette overlay mode was not implemented. Fixes XIII/Oxyron PIP mode.
+- Fixed uaegfx overlay corruption if allocated overlay bitmap width was not divisible by pixel byte size. (PiP_View + image with "unaligned" width)
+- Disassemmbling 68020+ full format extension type (an,dn,xxxx.w/.l) didn't print an part.
+
 Beta 6:
 
 - On the fly switching to built-in AROS ROM with low memory config (like basic A500) crashed.
diff --git a/scsitape.cpp b/scsitape.cpp
index 5cf36641..5005b18c 100644
--- 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"