commit c4d7323

Cleanup

 1@@ -553,17 +553,14 @@ screen_draw_pixel(void)
 2 		x1 = MAR(x1), y1 = MAR(y1);
 3 		hor = MAR(x2) - x1, ver = MAR(y2) - y1;
 4 		for(ay = y1 * len, by = ay + ver * len; ay < by; ay += len)
 5-			for(ax = ay + x1, bx = ax + hor; ax < bx; ax++) {
 6-				const int src = screen_layers[ax] & layer_mask;
 7-				screen_layers[ax] = src | color;
 8-			}
 9+			for(ax = ay + x1, bx = ax + hor; ax < bx; ax++)
10+				screen_layers[ax] = (screen_layers[ax] & layer_mask) | color;
11 	}
12 	/* pixel mode */
13 	else {
14 		if(rX >= 0 && rY >= 0 && rX < len && rY < screen_height) {
15 			const int ax = MAR(rX) + MAR(rY) * len;
16-			const int src = screen_layers[ax] & layer_mask;
17-			screen_layers[ax] = src | color;
18+			screen_layers[ax] = (screen_layers[ax] & layer_mask) | color;
19 		}
20 		screen_reqdraw = 1;
21 		if(rMX) rX++;
22@@ -600,10 +597,8 @@ screen_draw_sprite(void)
23 					const int ch2 = sprite[qy + 8] << 1;
24 					for(ax = xmar + ay, bx = xmar2 + ay, qx = qfx; ax < bx; ax++, qx -= fx) {
25 						const int color = (ch1 >> qx & 1) | (ch2 >> qx & 2);
26-						if(opaque || color) {
27-							const int src = screen_layers[ax] & layer_mask;
28-							screen_layers[ax] = src | table[color];
29-						}
30+						if(opaque || color)
31+							screen_layers[ax] = (screen_layers[ax] & layer_mask) | table[color];
32 					}
33 				}
34 			}
35@@ -619,10 +614,8 @@ screen_draw_sprite(void)
36 					const int ch1 = sprite[qy];
37 					for(ax = xmar + ay, bx = xmar2 + ay, qx = qfx; ax < bx; ax++, qx -= fx) {
38 						const int color = ch1 >> qx & 1;
39-						if(opaque || color) {
40-							const int src = screen_layers[ax] & layer_mask;
41-							screen_layers[ax] = src | table[color];
42-						}
43+						if(opaque || color)
44+							screen_layers[ax] = (screen_layers[ax] & layer_mask) | table[color];
45 					}
46 				}
47 			}