Apple-2-Tools
/
izapple2
mirror of https://github.com/ivanizag/izapple2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix text mix

This commit is contained in:
Ivan Izaguirre 2020-08-11 23:13:12 +02:00
parent 65f013e9b3
commit caa312c12a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
screen.go
View File

@ -92,9 +92,9 @@ func getCurrentVideoMode(a *Apple2) uint16 {
if isMixMode { if isMixMode {
if is80Columns { if is80Columns {
mode |= videoMixText80 mode |= videoMixText80
} else if isStore80Active { } else /* if isStore80Active {
mode |= videoMixText40RGB mode |= videoMixText40RGB
} else { } else */{
mode |= videoMixText40 mode |= videoMixText40
} }
} }
@ -171,7 +171,7 @@ func snapshotByMode(a *Apple2, videoMode uint16) *image.RGBA {
applyNTSCFilter = false applyNTSCFilter = false
} }
if applyNTSCFilter { if applyNTSCFilter {
snap = filterNTSCColor(snap, ntscMask) bottom = filterNTSCColor(bottom, ntscMask)
} }
snap = mixSnapshots(snap, bottom) snap = mixSnapshots(snap, bottom)
} }

2
screenLoRes.go
View File

@ -39,7 +39,7 @@ func getColorPatterns(light color.Color) [16][16]color.Color {
} }
func snapshotLoResModeMono(a *Apple2, isSecondPage bool, light color.Color) *image.RGBA { func snapshotLoResModeMono(a *Apple2, isSecondPage bool, light color.Color) *image.RGBA {
data := getTextFromMemory(a.mmu.physicalMainRAM, isSecondPage) data := getTextFromMemory(a.mmu.getVideoRAM(false), isSecondPage)
return renderGrMode(data, false /*isMeres*/, light) return renderGrMode(data, false /*isMeres*/, light)
} }