empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Andrea Odetti 2018-09-13 20:49:32 +01:00
commit d3abd9f2ac
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/Memory.cpp
View file

@ -1095,11 +1095,14 @@ LPBYTE MemGetAuxPtr(const WORD offset)
: memaux+offset; : memaux+offset;
#ifdef RAMWORKS #ifdef RAMWORKS
if ( ((SW_PAGE2 && SW_80STORE) || VideoGetSW80COL()) && // Video scanner (for 14M video modes) always fetches from 1st 64K aux bank (UTAIIe ref?)
( ( ((offset & 0xFF00)>=0x0400) && if (((SW_PAGE2 && SW_80STORE) || VideoGetSW80COL()) &&
((offset & 0xFF00)<=0x0700) ) || (
( SW_HIRES && ((offset & 0xFF00)>=0x2000) && ( ((offset & 0xFF00)>=0x0400) && ((offset & 0xFF00)<=0x0700) ) ||
((offset & 0xFF00)<=0x3F00) ) ) ) { ( SW_HIRES && ((offset & 0xFF00)>=0x2000) && ((offset & 0xFF00)<=0x3F00) )
)
)
{
lpMem = (memshadow[(offset >> 8)] == (RWpages[0]+(offset & 0xFF00))) lpMem = (memshadow[(offset >> 8)] == (RWpages[0]+(offset & 0xFF00)))
? mem+offset ? mem+offset
: RWpages[0]+offset; : RWpages[0]+offset;