d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screen_talk should not peek at addr when drawing a single pixel

This commit is contained in:
neauoire 2021-07-30 16:31:10 -07:00
parent 7f345428d6
commit 486e79c48d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/uxnemu.c
View File

@ -294,15 +294,17 @@ screen_talk(Device *d, Uint8 b0, Uint8 w)
if(w && b0 == 0xe) { if(w && b0 == 0xe) {
Uint16 x = mempeek16(d->dat, 0x8); Uint16 x = mempeek16(d->dat, 0x8);
Uint16 y = mempeek16(d->dat, 0xa); Uint16 y = mempeek16(d->dat, 0xa);
Uint8 *addr = &d->mem[mempeek16(d->dat, 0xc)];
Layer *layer = d->dat[0xe] >> 4 & 0x1 ? &ppu.fg : &ppu.bg; Layer *layer = d->dat[0xe] >> 4 & 0x1 ? &ppu.fg : &ppu.bg;
Uint8 mode = d->dat[0xe] >> 5; Uint8 mode = d->dat[0xe] >> 5;
if(!mode) if(!mode)
putpixel(&ppu, layer, x, y, d->dat[0xe] & 0x3); putpixel(&ppu, layer, x, y, d->dat[0xe] & 0x3);
else if(mode-- & 0x1) else {
puticn(&ppu, layer, x, y, addr, d->dat[0xe] & 0xf, mode & 0x2, mode & 0x4); Uint8 *addr = &d->mem[mempeek16(d->dat, 0xc)];
else if(mode-- & 0x1)
putchr(&ppu, layer, x, y, addr, d->dat[0xe] & 0xf, mode & 0x2, mode & 0x4); puticn(&ppu, layer, x, y, addr, d->dat[0xe] & 0xf, mode & 0x2, mode & 0x4);
else
putchr(&ppu, layer, x, y, addr, d->dat[0xe] & 0xf, mode & 0x2, mode & 0x4);
}
reqdraw = 1; reqdraw = 1;
} }
} }