Browse code

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

Devine Lu Linvega authored on 01/03/2023 19:31:10
Showing 2 changed files
... ...
@@ -16,7 +16,7 @@ WITH REGARD TO THIS SOFTWARE.
16 16
 
17 17
 UxnScreen uxn_screen;
18 18
 
19
-static Uint8 blending[5][16] = {
19
+static Uint8 blending[4][16] = {
20 20
 	{0, 0, 0, 0, 1, 0, 1, 1, 2, 2, 0, 2, 3, 3, 3, 0},
21 21
 	{0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3},
22 22
 	{1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1},
... ...
@@ -49,7 +49,7 @@ uxn_eval(Uxn *u, Uint16 pc)
49 49
 		switch(opcode - (!opcode * (instr >> 5))) {
50 50
 		/* Immediate */
51 51
 		case -0x0: /* BRK */ return 1;
52
-		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; }
52
+		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } /* else fallthrough */
53 53
 		case -0x2: /* JMI */ pc += PEEK16(u->ram + pc) + 2; break;
54 54
 		case -0x3: /* JSI */ s = u->rst; PUSH16(pc + 2) pc += PEEK16(u->ram + pc) + 2; break;
55 55
 		case -0x4: /* LIT */