commit bbab985

Simplified launch

 1@@ -34,12 +34,8 @@ typedef struct Uxn {
 2 	Stack wst, rst;
 3 } Uxn;
 4 
 5-/* required functions */
 6-
 7 extern Uint8 emu_dei(Uint8 addr);
 8 extern void emu_deo(Uint8 addr, Uint8 value);
 9 extern Uxn uxn;
10 
11-/* built-ins */
12-
13 int uxn_eval(Uxn *u, Uint16 pc);

 1@@ -258,20 +258,18 @@ emu_run(void)
 2 int
 3 main(int argc, char **argv)
 4 {
 5+	int i = 1;
 6+	char *rom = argc > 1 ? argv[i++] : "boot.rom";
 7 	if(argc > 1 && argv[1][0] == '-' && argv[1][1] == 'v')
 8 		fprintf(stdout, "Uxn11 - Varvara Emulator, 12 Nov 2024.\n");
 9-	else {
10-		int i = 1;
11-		char *rom = i == argc ? "boot.rom" : argv[i++];
12-		if(!system_boot(ram, rom))
13-			return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
14-		if(!display_init())
15-			return !fprintf(stdout, "Could not open display.\n");
16-		uxn.dev[0x17] = argc - i;
17-		if(uxn_eval(&uxn, PAGE_PROGRAM))
18-			console_listen(i, argc, argv), emu_run();
19-		close_console();
20-		XDestroyImage(ximage), XDestroyWindow(display, window), XCloseDisplay(display);
21-	}
22+	else if(!display_init())
23+		return !fprintf(stdout, "Could not open display.\n");
24+	else if(!system_boot(ram, rom))
25+		return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
26+	uxn.dev[0x17] = argc - i;
27+	if(uxn_eval(&uxn, PAGE_PROGRAM))
28+		console_listen(i, argc, argv), emu_run();
29+	close_console();
30+	XDestroyImage(ximage), XDestroyWindow(display, window), XCloseDisplay(display);
31 	return uxn.dev[0x0f] & 0x7f;
32 }