d6
/
uxn11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converter twos() to a macro

This commit is contained in:
Devine Lu Linvega 2024-01-20 17:00:05 -08:00
parent 12cb8e2b1a
commit b1f81dcd69
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/devices/screen.c
View File

@ -25,15 +25,6 @@ static Uint8 blending[4][16] = {
{1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1}, {1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1},
{2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2}}; {2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2}};
static int
twos(Uint16 value)
{
if(value & (1 << (sizeof(Uint16) * 8 - 1)))
return (int)value - (1 << sizeof(Uint16) * 8);
else
return (int)value;
}
static void static void
screen_2bpp(Uint8 *layer, Uint8 *addr, Uint16 x1, Uint16 y1, Uint16 color, int fx, int fy) screen_2bpp(Uint8 *layer, Uint8 *addr, Uint16 x1, Uint16 y1, Uint16 color, int fx, int fy)
{ {
@ -271,9 +262,9 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
case 0x5: screen_resize(uxn_screen.width, PEEK2(d + 4), uxn_screen.scale); return; case 0x5: screen_resize(uxn_screen.width, PEEK2(d + 4), uxn_screen.scale); return;
case 0x6: rMX = d[0x6] & 0x1, rMY = d[0x6] & 0x2, rMA = d[0x6] & 0x4, rML = d[0x6] >> 4, rDX = rMX << 3, rDY = rMY << 2; return; case 0x6: rMX = d[0x6] & 0x1, rMY = d[0x6] & 0x2, rMA = d[0x6] & 0x4, rML = d[0x6] >> 4, rDX = rMX << 3, rDY = rMY << 2; return;
case 0x8: case 0x8:
case 0x9: rX = twos((d[0x8] << 8) | d[0x9]); return; case 0x9: rX = (d[0x8] << 8) | d[0x9], rX = twos(rX); return;
case 0xa: case 0xa:
case 0xb: rY = twos((d[0xa] << 8) | d[0xb]); return; case 0xb: rY = (d[0xa] << 8) | d[0xb], rY = twos(rY); return;
case 0xc: case 0xc:
case 0xd: rA = (d[0xc] << 8) | d[0xd]; return; case 0xd: rA = (d[0xc] << 8) | d[0xd]; return;
case 0xe: { case 0xe: {

2
src/devices/screen.h
View File

@ -31,3 +31,5 @@ void screen_redraw(Uxn *u);
Uint8 screen_dei(Uxn *u, Uint8 addr); Uint8 screen_dei(Uxn *u, Uint8 addr);
void screen_deo(Uint8 *ram, Uint8 *d, Uint8 port); void screen_deo(Uint8 *ram, Uint8 *d, Uint8 port);
#define twos(v) (v & 0x8000 ? (int)v - 0x10000 : (int)v)