Browse code

Removed screen_wipe

Devine Lu Linvega authored on 12/04/2023 21:35:48
Showing 1 changed files
... ...
@@ -31,6 +31,7 @@ clamp(int val, int min, int max)
31 31
 static void
32 32
 screen_write(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 color)
33 33
 {
34
+
34 35
 	if(x < p->width && y < p->height) {
35 36
 		Uint32 i = x + y * p->width;
36 37
 		if(color != layer->pixels[i]) {
... ...
@@ -49,12 +50,6 @@ screen_fill(UxnScreen *p, Layer *layer, Uint16 x1, Uint16 y1, Uint16 x2, Uint16
49 50
 			screen_write(p, layer, h, v, color);
50 51
 }
51 52
 
52
-static void
53
-screen_wipe(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y)
54
-{
55
-	screen_fill(p, layer, x, y, x + 8, y + 8, 0);
56
-}
57
-
58 53
 static void
59 54
 screen_blit(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy, Uint8 twobpp)
60 55
 {
... ...
@@ -79,9 +74,9 @@ screen_palette(UxnScreen *p, Uint8 *addr)
79 74
 	int i, shift;
80 75
 	for(i = 0, shift = 4; i < 4; ++i, shift ^= 4) {
81 76
 		Uint8
82
-			r = (addr[0 + i / 2] >> shift) & 0x0f,
83
-			g = (addr[2 + i / 2] >> shift) & 0x0f,
84
-			b = (addr[4 + i / 2] >> shift) & 0x0f;
77
+			r = (addr[0 + i / 2] >> shift) & 0xf,
78
+			g = (addr[2 + i / 2] >> shift) & 0xf,
79
+			b = (addr[4 + i / 2] >> shift) & 0xf;
85 80
 		p->palette[i] = 0x0f000000 | r << 16 | g << 8 | b;
86 81
 		p->palette[i] |= p->palette[i] << 4;
87 82
 	}
... ...
@@ -143,9 +138,10 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
143 138
 	case 0xe: {
144 139
 		Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa);
145 140
 		Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
146
-		if(d[0xe] & 0x80)
147
-			screen_fill(&uxn_screen, layer, (d[0xe] & 0x10) ? 0 : x, (d[0xe] & 0x20) ? 0 : y, (d[0xe] & 0x10) ? x : uxn_screen.width, (d[0xe] & 0x20) ? y : uxn_screen.height, d[0xe] & 0x3);
148
-		else {
141
+		if(d[0xe] & 0x80) {
142
+			Uint8 xflip = d[0xe] & 0x10, yflip = d[0xe] & 0x20;
143
+			screen_fill(&uxn_screen, layer, xflip ? 0 : x, yflip ? 0 : y, xflip ? x : uxn_screen.width, yflip ? y : uxn_screen.height, d[0xe] & 0x3);
144
+		} else {
149 145
 			screen_write(&uxn_screen, layer, x, y, d[0xe] & 0x3);
150 146
 			if(d[0x6] & 0x1) POKE2(d + 0x8, x + 1); /* auto x+1 */
151 147
 			if(d[0x6] & 0x2) POKE2(d + 0xa, y + 1); /* auto y+1 */
... ...
@@ -154,17 +150,17 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
154 150
 	}
155 151
 	case 0xf: {
156 152
 		Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa), dx, dy, addr = PEEK2(d + 0xc);
157
-		Uint8 i, n, twobpp = !!(d[0xf] & 0x80);
153
+		Uint8 i, n = d[0x6] >> 4, twobpp = !!(d[0xf] & 0x80);
158 154
 		Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
159
-		n = d[0x6] >> 4;
160 155
 		dx = (d[0x6] & 0x01) << 3;
161 156
 		dy = (d[0x6] & 0x02) << 2;
162 157
 		if(addr > 0x10000 - ((n + 1) << (3 + twobpp)))
163 158
 			return;
164 159
 		for(i = 0; i <= n; i++) {
165
-			if(!(d[0xf] & 0xf))
166
-				screen_wipe(&uxn_screen, layer, x + dy * i, y + dx * i);
167
-			else {
160
+			if(!(d[0xf] & 0xf)) {
161
+				Uint16 ex = x + dy * i, ey = y + dx * i;
162
+				screen_fill(&uxn_screen, layer, ex, ey, ex + 8, ey + 8, 0);
163
+			} else {
168 164
 				screen_blit(&uxn_screen, layer, x + dy * i, y + dx * i, &ram[addr], d[0xf] & 0xf, d[0xf] & 0x10, d[0xf] & 0x20, twobpp);
169 165
 				addr += (d[0x6] & 0x04) << (1 + twobpp);
170 166
 			}