commit cd26378

(screen) Cleanup

 1@@ -62,8 +62,8 @@ screen_change(int x1, int y1, int x2, int y2)
 2 void
 3 screen_fill(Uint8 *layer, int color)
 4 {
 5-	int i, length = MAR2(uxn_screen.width) * uxn_screen.height;
 6-	for(i = 0; i < length; i++)
 7+	int i, len = MAR2(uxn_screen.width) * uxn_screen.height;
 8+	for(i = 0; i < len; i++)
 9 		layer[i] = color;
10 }
11 
12@@ -223,17 +223,17 @@ screen_deo(Uxn *u, Uint8 addr)
13 		Uint8 blend = ctrl & 0xf;
14 		Uint8 *layer = ctrl & 0x40 ? uxn_screen.fg : uxn_screen.bg;
15 		int fx = ctrl & 0x10 ? -1 : 1, fy = ctrl & 0x20 ? -1 : 1;
16-		int x1, x2, y1, y2, ch1, ch2, ax, ay, qx, qy, x = rX, y = rY;
17+		int x1, x2, y1, y2, ax, ay, qx, qy, x = rX, y = rY;
18 		int dxy = rDX * fy, dyx = rDY * fx, addr_incr = rMA << (1 + twobpp);
19 		if(twobpp)
20 			for(i = 0; i <= rML; i++, x += dyx, y += dxy, rA += addr_incr) {
21 				Uint16 xx = MAR(x), yy = MAR(y);
22 				if(xx < MAR(uxn_screen.width) && MAR(yy) < MAR2(uxn_screen.height)) {
23 					Uint8 *sprite = &u->ram[rA];
24-					int opaque = blend % 5, length = MAR2(uxn_screen.width), y2 = (yy + 8) * length;
25-					for(ay = yy * length, qy = fy < 0 ? 7 : 0; ay < y2; ay += length, qy += fy) {
26-						ch1 = sprite[qy], ch2 = sprite[qy + 8] << 1, x2 = xx + 8 + ay;
27-						for(ax = xx + ay, qx = fx > 0 ? 7 : 0; ax < x2; ax++, qx -= fx) {
28+					int opaque = blend % 5, len = MAR2(uxn_screen.width), by = (yy + 8) * len;
29+					for(ay = yy * len, qy = fy < 0 ? 7 : 0; ay < by; ay += len, qy += fy) {
30+						int ch1 = sprite[qy], ch2 = sprite[qy + 8] << 1, bx = xx + 8 + ay;
31+						for(ax = xx + ay, qx = fx > 0 ? 7 : 0; ax < bx; ax++, qx -= fx) {
32 							int color = ((ch1 >> qx) & 1) | ((ch2 >> qx) & 2);
33 							if(opaque || color) layer[ax] = blending[color][blend];
34 						}
35@@ -245,10 +245,10 @@ screen_deo(Uxn *u, Uint8 addr)
36 				Uint16 xx = MAR(x), yy = MAR(y);
37 				if(xx < MAR(uxn_screen.width) && MAR(yy) < MAR2(uxn_screen.height)) {
38 					Uint8 *sprite = &u->ram[rA];
39-					int opaque = blend % 5, length = MAR2(uxn_screen.width), row = yy * length;
40-					for(ay = yy, qy = fy < 0 ? 7 : 0; ay < yy + 8; ay++, qy += fy, row += length) {
41-						ch1 = sprite[qy], x2 = xx + 8 + row;
42-						for(ax = xx + row, qx = fx > 0 ? 7 : 0; ax < x2; ax++, qx -= fx) {
43+					int opaque = blend % 5, len = MAR2(uxn_screen.width), by = (yy + 8) * len;
44+					for(ay = yy * len, qy = fy < 0 ? 7 : 0; ay < by; ay += len, qy += fy) {
45+						int ch1 = sprite[qy], bx = xx + 8 + ay;
46+						for(ax = xx + ay, qx = fx > 0 ? 7 : 0; ax < bx; ax++, qx -= fx) {
47 							int color = (ch1 >> qx) & 1;
48 							if(opaque || color) layer[ax] = blending[color][blend];
49 						}