claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed two very stupid mistakes in said cursor rewrite.

Browse Source
This commit is contained in:
OBattler
2020-10-18 00:14:33 +02:00
parent 5f531d6a27
commit f2a46d7700
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/vid_tgui9440.c
View File

@@ -683,7 +683,7 @@ void tgui_hwcursor_draw(svga_t *svga, int displine)
int offset = svga->hwcursor_latch.x + svga->hwcursor_latch.xoff; int offset = svga->hwcursor_latch.x + svga->hwcursor_latch.xoff;
int pitch = (svga->hwcursor.xsize == 64) ? 16 : 8; int pitch = (svga->hwcursor.xsize == 64) ? 16 : 8;
int byte, bit; int byte, bit;
int color; uint32_t color;
if (svga->interlace && svga->hwcursor_oddeven) if (svga->interlace && svga->hwcursor_oddeven)
svga->hwcursor_latch.addr += pitch; svga->hwcursor_latch.addr += pitch;
@@ -694,7 +694,7 @@ void tgui_hwcursor_draw(svga_t *svga, int displine)
dat[0] = (svga->vram[byte] >> bit) & 0x01; /* AND */ dat[0] = (svga->vram[byte] >> bit) & 0x01; /* AND */
dat[1] = (svga->vram[(pitch >> 1) + byte] >> bit) & 0x01; /* XOR */ dat[1] = (svga->vram[(pitch >> 1) + byte] >> bit) & 0x01; /* XOR */
val = (dat[0] << 1) || dat[1]; val = (dat[0] << 1) || dat[1];
color = svga->vram[svga->x_add + offset + xx]; color = ((uint32_t *)buffer32->line[displine])[svga->x_add + offset + xx];
if (!!(svga->crtc[0x50] & 0x40)) { if (!!(svga->crtc[0x50] & 0x40)) {
/* X11 style? */ /* X11 style? */
switch (val) { switch (val) {
@@ -724,7 +724,7 @@ void tgui_hwcursor_draw(svga_t *svga, int displine)
break; break;
} }
} }
svga->vram[svga->x_add + offset + xx] = color; ((uint32_t *)buffer32->line[displine])[svga->x_add + offset + xx] = color;
} }
svga->hwcursor_latch.addr += pitch; svga->hwcursor_latch.addr += pitch;