From 02abb444e1549f79e64234f65628a4b142872782 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 24 Nov 2018 20:59:06 +0200 Subject: [PATCH] 4100b11 --- akiko.cpp | 2 +- include/cpummu030.h | 2 +- od-win32/win32.h | 4 ++-- od-win32/win32gfx.cpp | 4 ---- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/akiko.cpp b/akiko.cpp index 8ffd83c7..ef8f6e9e 100644 --- a/akiko.cpp +++ b/akiko.cpp @@ -164,7 +164,7 @@ #define AKIKO_DEBUG_IO 1 #define AKIKO_DEBUG_IO_CMD 1 -#define AKIKO_DEBUG_IRQ 1 +#define AKIKO_DEBUG_IRQ 0 int log_cd32 = 0; diff --git a/include/cpummu030.h b/include/cpummu030.h index 35848816..f8049452 100644 --- a/include/cpummu030.h +++ b/include/cpummu030.h @@ -1,7 +1,7 @@ #ifndef UAE_CPUMMU030_H #define UAE_CPUMMU030_H -#define MMU030_DEBUG 1 +#define MMU030_DEBUG 0 #include "uae/types.h" diff --git a/od-win32/win32.h b/od-win32/win32.h index efaeb235..b4726cd3 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("10") +#define WINUAEBETA _T("11") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2018, 11, 17) +#define WINUAEDATE MAKEBD(2018, 11, 24) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp index fdde3e20..67abb59c 100644 --- a/od-win32/win32gfx.cpp +++ b/od-win32/win32gfx.cpp @@ -590,16 +590,12 @@ void getgfxoffset(int monid, float *dxp, float *dyp, float *mxp, float *myp) float dx, dy; getfilteroffset(monid, &dx, &dy, mxp, myp); - *dxp = dx; - *dyp = dy; if (ad->picasso_on) { dx = picasso_offset_x; dy = picasso_offset_y; *mxp = picasso_offset_mx; *myp = picasso_offset_my; } - *dxp = dx; - *dyp = dy; if (mon->currentmode.flags & DM_W_FULLSCREEN) { if (mon->scalepicasso && mon->screen_is_picasso) return; -- 2.47.3