From d2942e5a1312b9be242b0e716bdc7ea6cca8f732 Mon Sep 17 00:00:00 2001 From: tomch Date: Sat, 11 Aug 2007 11:25:51 +0000 Subject: [PATCH] Fix so that Infiltrator boots --- source/Mockingboard.cpp | 4 ++-- source/Video.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/Mockingboard.cpp b/source/Mockingboard.cpp index 80105dfc..7d5bc684 100644 --- a/source/Mockingboard.cpp +++ b/source/Mockingboard.cpp @@ -1458,7 +1458,7 @@ static BYTE __stdcall MB_Write(WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, UL static BYTE __stdcall PhasorIO (WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, ULONG nCyclesLeft) { if(!g_bPhasorEnable) - return 0; + return MemReadFloatingBus(nCyclesLeft); if(g_nPhasorMode < 2) g_nPhasorMode = nAddr & 1; @@ -1467,7 +1467,7 @@ static BYTE __stdcall PhasorIO (WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, U AY8910_InitClock((int)fCLK); - return 0; + return MemReadFloatingBus(nCyclesLeft); } //----------------------------------------------------------------------------- diff --git a/source/Video.cpp b/source/Video.cpp index ba19677a..3efeff84 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -2168,7 +2168,7 @@ WORD VideoGetScannerAddress(bool* pbVblBar_OUT, const DWORD uExecutedCycles) // machine state switches // - int nHires = (SW_HIRES) ? 1 : 0; + int nHires = (SW_HIRES & !SW_TEXT) ? 1 : 0; int nPage2 = (SW_PAGE2) ? 1 : 0; int n80Store = (MemGet80Store()) ? 1 : 0; @@ -2213,7 +2213,7 @@ WORD VideoGetScannerAddress(bool* pbVblBar_OUT, const DWORD uExecutedCycles) // calculate scanning memory address // - if (SW_HIRES && SW_MIXED && (v_4 & v_2)) + if (SW_HIRES && SW_MIXED && (v_4 & v_2)) // NICK: Should this be (SW_HIRES && !SW_TEXT) instead of just 'SW_HIRES' ? { nHires = 0; // (address is in text memory) }