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

(Screen) Removed v value

This commit is contained in:
neauoire 2023-11-12 11:36:34 -08:00
parent 98c7036252
commit 224202e562
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/devices/screen.c
View File

@ -58,18 +58,18 @@ screen_rect(Uint8 *layer, Uint16 x1, Uint16 y1, Uint16 x2, Uint16 y2, int color)
static void static void
screen_2bpp(Uint8 *layer, Uint8 *ram, Uint16 addr, Uint16 x1, Uint16 y1, Uint16 color, int fx, int fy) screen_2bpp(Uint8 *layer, Uint8 *ram, Uint16 addr, Uint16 x1, Uint16 y1, Uint16 color, int fx, int fy)
{ {
int v, h, width = uxn_screen.width, height = uxn_screen.height, opaque = (color % 5); int h, width = uxn_screen.width, height = uxn_screen.height, opaque = (color % 5);
Uint8 *ch1 = &ram[addr], *ch2 = ch1 + 8, mx = (fx > 0 ? 8 : 0), my = (fy < 0 ? 8 : 0); Uint8 *ch1 = &ram[addr], *ch2 = ch1 + 8, mx = (fx > 0 ? 8 : 0);
Uint16 yy = y1 + my; Uint16 y, ymod = (fy < 0 ? 8 : 0), ymax = y1 + ymod + fy * 8;
for(v = 0; v < 8; v++) { // Uint16 x, xmod = (fx < 0 ? 8 : 0), xmax = x1 + xmod + fx * 8;
for(y = y1 + ymod; y != ymax; y += fy) {
Uint16 c = *ch1++ | (*ch2++ << 8); Uint16 c = *ch1++ | (*ch2++ << 8);
Uint16 xx = x1 + mx; Uint16 xx = x1 + mx;
yy += fy;
for(h = 7; h >= 0; --h, c >>= 1) { for(h = 7; h >= 0; --h, c >>= 1) {
Uint8 ch = (c & 1) | ((c >> 7) & 2); Uint8 ch = (c & 1) | ((c >> 7) & 2);
xx += -fx; xx += -fx;
if((opaque || ch) && xx < width && yy < height) if((opaque || ch) && xx < width && y < height)
layer[xx + yy * width] = blending[ch][color]; layer[xx + y * width] = blending[ch][color];
} }
} }
} }