commit fbde47f

(screen) Cleanup

 1@@ -263,17 +263,15 @@ screen_deo(Uxn *u, Uint8 addr)
 2 		int dxy = rDX * fy, dyx = rDY * fx, addr_incr = rMA << (1 + twobpp);
 3 		if(twobpp)
 4 			for(i = 0; i <= rML; i++, x += dyx, y += dxy, rA += addr_incr) {
 5-				Uint16 xx = MAR(x);
 6-				Uint16 yy = MAR(y);
 7+				Uint16 xx = MAR(x), yy = MAR(y);
 8 				if(xx < MAR(uxn_screen.width) && MAR(yy) < MAR2(uxn_screen.height))
 9 					screen_2bpp(layer, &u->ram[rA], xx, yy, color, fx, fy);
10 			}
11 		else
12 			for(i = 0; i <= rML; i++, x += dyx, y += dxy, rA += addr_incr) {
13-				Uint16 xx = MAR(x);
14-				Uint16 yy = MAR(y);
15+				Uint16 xx = MAR(x), yy = MAR(y);
16 				if(xx < MAR(uxn_screen.width) && MAR(yy) < MAR2(uxn_screen.height))
17-					screen_1bpp(layer, &u->ram[rA], MAR(x), MAR(y), color, fx, fy);
18+					screen_1bpp(layer, &u->ram[rA], xx, yy, color, fx, fy);
19 			}
20 		if(fx < 0)
21 			x1 = x, x2 = rX;