... | ... |
@@ -135,12 +135,10 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port) |
135 | 135 |
{ |
136 | 136 |
switch(port) { |
137 | 137 |
case 0x3: |
138 |
- if(!FIXED_SIZE) |
|
139 |
- screen_resize(&uxn_screen, clamp(PEEK2(d + 2), 1, 1024), uxn_screen.height); |
|
138 |
+ screen_resize(&uxn_screen, clamp(PEEK2(d + 2), 1, 1024), uxn_screen.height); |
|
140 | 139 |
break; |
141 | 140 |
case 0x5: |
142 |
- if(!FIXED_SIZE) |
|
143 |
- screen_resize(&uxn_screen, uxn_screen.width, clamp(PEEK2(d + 4), 1, 1024)); |
|
141 |
+ screen_resize(&uxn_screen, uxn_screen.width, clamp(PEEK2(d + 4), 1, 1024)); |
|
144 | 142 |
break; |
145 | 143 |
case 0xe: { |
146 | 144 |
Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa); |
... | ... |
@@ -149,8 +147,8 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port) |
149 | 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); |
150 | 148 |
else { |
151 | 149 |
screen_write(&uxn_screen, layer, x, y, d[0xe] & 0x3); |
152 |
- if(d[0x6] & 0x01) POKE2(d + 0x8, x + 1); /* auto x+1 */ |
|
153 |
- if(d[0x6] & 0x02) POKE2(d + 0xa, y + 1); /* auto y+1 */ |
|
150 |
+ if(d[0x6] & 0x1) POKE2(d + 0x8, x + 1); /* auto x+1 */ |
|
151 |
+ if(d[0x6] & 0x2) POKE2(d + 0xa, y + 1); /* auto y+1 */ |
|
154 | 152 |
} |
155 | 153 |
break; |
156 | 154 |
} |
... | ... |
@@ -171,9 +169,9 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port) |
171 | 169 |
addr += (d[0x6] & 0x04) << (1 + twobpp); |
172 | 170 |
} |
173 | 171 |
} |
174 |
- POKE2(d + 0xc, addr); /* auto addr+length */ |
|
175 |
- POKE2(d + 0x8, x + dx); /* auto x+8 */ |
|
176 |
- POKE2(d + 0xa, y + dy); /* auto y+8 */ |
|
172 |
+ if(d[0x6] & 0x1) POKE2(d + 0x8, x + dx); /* auto x+8 */ |
|
173 |
+ if(d[0x6] & 0x2) POKE2(d + 0xa, y + dy); /* auto y+8 */ |
|
174 |
+ if(d[0x6] & 0x4) POKE2(d + 0xc, addr); /* auto addr+length */ |
|
177 | 175 |
break; |
178 | 176 |
} |
179 | 177 |
} |
... | ... |
@@ -10,8 +10,6 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
10 | 10 |
WITH REGARD TO THIS SOFTWARE. |
11 | 11 |
*/ |
12 | 12 |
|
13 |
-#define FIXED_SIZE 0 |
|
14 |
- |
|
15 | 13 |
typedef struct Layer { |
16 | 14 |
Uint8 *pixels, changed; |
17 | 15 |
} Layer; |
... | ... |
@@ -20,7 +18,6 @@ typedef struct UxnScreen { |
20 | 18 |
Uint32 palette[4], *pixels; |
21 | 19 |
Uint16 width, height; |
22 | 20 |
Layer fg, bg; |
23 |
- Uint8 mono; |
|
24 | 21 |
} UxnScreen; |
25 | 22 |
|
26 | 23 |
extern UxnScreen uxn_screen; |