uxn

commit 96a19b4887909f19a6a226f789d6d0966bd9c3a6
parent dae025af20596a02a4fac6931f315d55bf488cd3
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date:   Wed,  1 Mar 2023 11:31:10 -0800

Merge branch 'main' of git.sr.ht:~rabbits/uxn

Diffstat:
M
src/devices/screen.c
 | 
2
+-
M
src/uxn.c
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/devices/screen.c b/src/devices/screen.c
@@ -16,7 +16,7 @@ WITH REGARD TO THIS SOFTWARE.
 
 UxnScreen uxn_screen;
 
-static Uint8 blending[5][16] = {
+static Uint8 blending[4][16] = {
 	{0, 0, 0, 0, 1, 0, 1, 1, 2, 2, 0, 2, 3, 3, 3, 0},
 	{0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3},
 	{1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1},
diff --git a/src/uxn.c b/src/uxn.c
@@ -49,7 +49,7 @@ uxn_eval(Uxn *u, Uint16 pc)
 		switch(opcode - (!opcode * (instr >> 5))) {
 		/* Immediate */
 		case -0x0: /* BRK */ return 1;
-		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; }
+		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } /* else fallthrough */
 		case -0x2: /* JMI */ pc += PEEK16(u->ram + pc) + 2; break;
 		case -0x3: /* JSI */ s = u->rst; PUSH16(pc + 2) pc += PEEK16(u->ram + pc) + 2; break;
 		case -0x4: /* LIT */