4100b11

diff --git a/akiko.cpp b/akiko.cpp
index 8ffd83c7b465511df0561229a7afcf79b69eed0d..ef8f6e9eca34860d69aea5465c6d6c507963b80d 100644 (file)
--- 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 35848816df5a106d4b654ee39c29342d7685f320..f804945221509a4db367f5d5145b96a38ed46b49 100644 (file)
--- 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 efaeb23542dadcb1f389461ae99cfdac270024f6..b4726cd3c394b0479ce4defc2c2966d0c8356fc2 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("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 fdde3e203943bba53c80f37095305f85c5789201..67abb59cfa76ba21829c49ec965d2232924534cd 100644 (file)
--- 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;