uxn

commit be138f59528455eb37b4bd3c50b237c7cc4d384f
parent 11e9b635c80faebf1059b1ef27eee3819f246514
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date:   Wed, 12 Apr 2023 12:22:17 -0700

Removed FIXED_SIZE flag

Diffstat:
M
src/devices/screen.c
 | 
16
+++++++---------
M
src/devices/screen.h
 | 
3
---

2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/devices/screen.c b/src/devices/screen.c
@@ -135,12 +135,10 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
 {
 	switch(port) {
 	case 0x3:
-		if(!FIXED_SIZE)
-			screen_resize(&uxn_screen, clamp(PEEK2(d + 2), 1, 1024), uxn_screen.height);
+		screen_resize(&uxn_screen, clamp(PEEK2(d + 2), 1, 1024), uxn_screen.height);
 		break;
 	case 0x5:
-		if(!FIXED_SIZE)
-			screen_resize(&uxn_screen, uxn_screen.width, clamp(PEEK2(d + 4), 1, 1024));
+		screen_resize(&uxn_screen, uxn_screen.width, clamp(PEEK2(d + 4), 1, 1024));
 		break;
 	case 0xe: {
 		Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa);
@@ -149,8 +147,8 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
 			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);
 		else {
 			screen_write(&uxn_screen, layer, x, y, d[0xe] & 0x3);
-			if(d[0x6] & 0x01) POKE2(d + 0x8, x + 1); /* auto x+1 */
-			if(d[0x6] & 0x02) POKE2(d + 0xa, y + 1); /* auto y+1 */
+			if(d[0x6] & 0x1) POKE2(d + 0x8, x + 1); /* auto x+1 */
+			if(d[0x6] & 0x2) POKE2(d + 0xa, y + 1); /* auto y+1 */
 		}
 		break;
 	}
@@ -171,9 +169,9 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
 				addr += (d[0x6] & 0x04) << (1 + twobpp);
 			}
 		}
-		POKE2(d + 0xc, addr);   /* auto addr+length */
-		POKE2(d + 0x8, x + dx); /* auto x+8 */
-		POKE2(d + 0xa, y + dy); /* auto y+8 */
+		if(d[0x6] & 0x1) POKE2(d + 0x8, x + dx); /* auto x+8 */
+		if(d[0x6] & 0x2) POKE2(d + 0xa, y + dy); /* auto y+8 */
+		if(d[0x6] & 0x4) POKE2(d + 0xc, addr);   /* auto addr+length */
 		break;
 	}
 	}
diff --git a/src/devices/screen.h b/src/devices/screen.h
@@ -10,8 +10,6 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-#define FIXED_SIZE 0
-
 typedef struct Layer {
 	Uint8 *pixels, changed;
 } Layer;
@@ -20,7 +18,6 @@ typedef struct UxnScreen {
 	Uint32 palette[4], *pixels;
 	Uint16 width, height;
 	Layer fg, bg;
-	Uint8 mono;
 } UxnScreen;
 
 extern UxnScreen uxn_screen;