commit d052822
Devine Lu Linvega
·
2024-11-13 01:16:17 +0000 UTC
parent 7021ac6
Improved booting
2 files changed,
+6,
-5
+1,
-1
1@@ -96,7 +96,7 @@ system_boot(Uint8 *ram, char *boot)
2 boot_rom = boot;
3 return 1;
4 }
5- return system_error("Could not load rom", boot);
6+ return 0;
7 }
8
9 /* IO */
+5,
-4
1@@ -259,12 +259,13 @@ int
2 main(int argc, char **argv)
3 {
4 int i = 1;
5- char *rom = argc > 1 ? argv[i++] : "boot.rom";
6 if(argc > 1 && argv[1][0] == '-' && argv[1][1] == 'v')
7- fprintf(stdout, "Uxn11 - Varvara Emulator, 12 Nov 2024.\n");
8+ fprintf(stdout, "Uxn11 - Varvara Emulator, 12 Nov 2024.\n"), i++;
9 else if(!display_init())
10- return !fprintf(stdout, "Could not open display.\n");
11- else if(!system_boot(ram, rom))
12+ return !fprintf(stdout, "Could not init: display\n");
13+ else if(argc > 1 && !system_boot(ram, argv[i++]))
14+ return !fprintf(stdout, "Could not load rom: %s\n", argv[i-1]);
15+ else if(!system_boot(ram, "boot.rom"))
16 return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
17 uxn.dev[0x17] = argc - i;
18 if(uxn_eval(&uxn, PAGE_PROGRAM))