Mercurial > repos > blastem
annotate blastem.c @ 1645:84ef1eb2c96a
Added code for actually saving new controller bindings to an appropriate key in the config file
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Fri, 30 Nov 2018 00:35:05 -0800 |
parents | 360d5bab199f |
children | b7ecd0d6a77b 9b8fe6729877 |
rev | line source |
---|---|
467
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
464
diff
changeset
|
1 /* |
1018
dba8c630bdbf
Update changelog and version number for 0.4.0 release
Michael Pavone <pavone@retrodev.com>
parents:
1017
diff
changeset
|
2 Copyright 2013-2016 Michael Pavone |
469
5f3344d0d42f
Fix argument handling so that the rom filename does not need to be specified first
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
3 This file is part of BlastEm. |
467
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
464
diff
changeset
|
4 BlastEm is free software distributed under the terms of the GNU General Public License version 3 or greater. See COPYING for full license text. |
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
464
diff
changeset
|
5 */ |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
6 #include <stdio.h> |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
7 #include <stdlib.h> |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
8 #include <string.h> |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
9 #include <ctype.h> |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
10 |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
11 #include "system.h" |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
12 #include "68kinst.h" |
569
9b7fcf748be0
Rename x86_68k_options and m68k_to_x86.h to m68k_options and m68k_core.h respectively
Michael Pavone <pavone@retrodev.com>
parents:
565
diff
changeset
|
13 #include "m68k_core.h" |
260
625f8e4d5fd2
Initial stab at integartiong Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
215
diff
changeset
|
14 #include "z80_to_x86.h" |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
15 #include "mem.h" |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
16 #include "vdp.h" |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
17 #include "render.h" |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
18 #include "genesis.h" |
515
1495179d6737
Initial GDB remote debugging support. Lacks some features, but breakpoints and basic inspection of registers and memory work.
Mike Pavone <pavone@retrodev.com>
parents:
510
diff
changeset
|
19 #include "gdb_remote.h" |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
447
diff
changeset
|
20 #include "gst.h" |
496
6fc71114d145
Extract function to determine executable directory from load_config so it can be used elsewhere
Mike Pavone <pavone@retrodev.com>
parents:
488
diff
changeset
|
21 #include "util.h" |
764
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
22 #include "romdb.h" |
832
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
23 #include "terminal.h" |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
24 #include "arena.h" |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
25 #include "config.h" |
1583
430dd12e4010
Refactor to split device bindings from IO emulation code
Michael Pavone <pavone@retrodev.com>
parents:
1582
diff
changeset
|
26 #include "bindings.h" |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
27 #include "menu.h" |
1531
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
28 #include "zip.h" |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
29 #ifndef DISABLE_NUKLEAR |
1474
c5c022c7aa54
Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
30 #include "nuklear_ui/blastem_nuklear.h" |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
31 #endif |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
32 |
1550
b525491b4e5b
There will be no 0.5.2 at this point
Michael Pavone <pavone@retrodev.com>
parents:
1534
diff
changeset
|
33 #define BLASTEM_VERSION "0.6.0-pre" |
464 | 34 |
860
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
35 #ifdef __ANDROID__ |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
36 #define FULLSCREEN_DEFAULT 1 |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
37 #else |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
38 #define FULLSCREEN_DEFAULT 0 |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
39 #endif |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
40 |
215
2b1c2c28b261
Added headless flag to avoid initializing SDL and opening a window when running tests.
Mike Pavone <pavone@retrodev.com>
parents:
211
diff
changeset
|
41 int headless = 0; |
505
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
42 int exit_after = 0; |
265
c6d12878ea93
Add -n flag for disabling the Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
264
diff
changeset
|
43 int z80_enabled = 1; |
356
79e4b466e7d0
Get rid of debug puts and limit based on audio rather than frame rate by default.
Mike Pavone <pavone@retrodev.com>
parents:
354
diff
changeset
|
44 int frame_limit = 0; |
1428
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
45 uint8_t use_native_states = 1; |
215
2b1c2c28b261
Added headless flag to avoid initializing SDL and opening a window when running tests.
Mike Pavone <pavone@retrodev.com>
parents:
211
diff
changeset
|
46 |
430
7f84090ab1cd
Add config file parser and default config file
Mike Pavone <pavone@retrodev.com>
parents:
425
diff
changeset
|
47 tern_node * config; |
7f84090ab1cd
Add config file parser and default config file
Mike Pavone <pavone@retrodev.com>
parents:
425
diff
changeset
|
48 |
166 | 49 #define SMD_HEADER_SIZE 512 |
50 #define SMD_MAGIC1 0x03 | |
51 #define SMD_MAGIC2 0xAA | |
52 #define SMD_MAGIC3 0xBB | |
53 #define SMD_BLOCK_SIZE 0x4000 | |
54 | |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
55 #ifdef DISABLE_ZLIB |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
56 #define ROMFILE FILE* |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
57 #define romopen fopen |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
58 #define romread fread |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
59 #define romseek fseek |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
60 #define romgetc fgetc |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
61 #define romclose fclose |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
62 #else |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
63 #include "zlib/zlib.h" |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
64 #define ROMFILE gzFile |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
65 #define romopen gzopen |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
66 #define romread gzfread |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
67 #define romseek gzseek |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
68 #define romgetc gzgetc |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
69 #define romclose gzclose |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
70 #endif |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
71 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
72 int load_smd_rom(ROMFILE f, void **buffer) |
166 | 73 { |
74 uint8_t block[SMD_BLOCK_SIZE]; | |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
75 romseek(f, SMD_HEADER_SIZE, SEEK_SET); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
76 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
77 size_t filesize = 512 * 1024; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
78 size_t readsize = 0; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
79 uint16_t *dst = malloc(filesize); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
80 |
488
32f053ad9b02
Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents:
487
diff
changeset
|
81 |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
82 size_t read; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
83 do { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
84 if ((readsize + SMD_BLOCK_SIZE > filesize)) { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
85 filesize *= 2; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
86 dst = realloc(dst, filesize); |
166 | 87 } |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
88 read = romread(block, 1, SMD_BLOCK_SIZE, f); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
89 if (read > 0) { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
90 for (uint8_t *low = block, *high = (block+read/2), *end = block+read; high < end; high++, low++) { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
91 *(dst++) = *low << 8 | *high; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
92 } |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
93 readsize += read; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
94 } |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
95 } while(read > 0); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
96 romclose(f); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
97 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
98 *buffer = dst; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
99 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
100 return readsize; |
166 | 101 } |
102 | |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
103 uint32_t load_rom_zip(const char *filename, void **dst) |
1531
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
104 { |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
105 static const char *valid_exts[] = {"bin", "md", "gen", "sms", "rom"}; |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
106 const uint32_t num_exts = sizeof(valid_exts)/sizeof(*valid_exts); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
107 zip_file *z = zip_open(filename); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
108 if (!z) { |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
109 return 0; |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
110 } |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
111 |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
112 for (uint32_t i = 0; i < z->num_entries; i++) |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
113 { |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
114 char *ext = path_extension(z->entries[i].name); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
115 if (!ext) { |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
116 continue; |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
117 } |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
118 for (uint32_t j = 0; j < num_exts; j++) |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
119 { |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
120 if (!strcasecmp(ext, valid_exts[j])) { |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
121 size_t out_size = nearest_pow2(z->entries[i].size); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
122 *dst = zip_read(z, i, &out_size); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
123 if (*dst) { |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
124 free(ext); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
125 zip_close(z); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
126 return out_size; |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
127 } |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
128 } |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
129 } |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
130 free(ext); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
131 } |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
132 zip_close(z); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
133 return 0; |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
134 } |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
135 |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
136 uint32_t load_rom(const char * filename, void **dst, system_type *stype) |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
137 { |
166 | 138 uint8_t header[10]; |
1531
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
139 char *ext = path_extension(filename); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
140 if (!strcasecmp(ext, "zip")) { |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
141 free(ext); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
142 return load_rom_zip(filename, dst); |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
143 } |
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
144 free(ext); |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
145 ROMFILE f = romopen(filename, "rb"); |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
146 if (!f) { |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
147 return 0; |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
148 } |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
149 if (sizeof(header) != romread(header, 1, sizeof(header), f)) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
150 fatal_error("Error reading from %s\n", filename); |
776
cbf97d335444
Full support for Sega mapper when it comes to data. Code in remapped sections may not work reliably. SSF2 now works.
Michael Pavone <pavone@retrodev.com>
parents:
774
diff
changeset
|
151 } |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
152 |
166 | 153 if (header[1] == SMD_MAGIC1 && header[8] == SMD_MAGIC2 && header[9] == SMD_MAGIC3) { |
154 int i; | |
155 for (i = 3; i < 8; i++) { | |
156 if (header[i] != 0) { | |
157 break; | |
158 } | |
159 } | |
160 if (i == 8) { | |
161 if (header[2]) { | |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
162 fatal_error("%s is a split SMD ROM which is not currently supported", filename); |
166 | 163 } |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
164 if (stype) { |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
165 *stype = SYSTEM_GENESIS; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
166 } |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
167 return load_smd_rom(f, dst); |
166 | 168 } |
169 } | |
1529
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
170 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
171 size_t filesize = 512 * 1024; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
172 size_t readsize = sizeof(header); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
173 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
174 char *buf = malloc(filesize); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
175 memcpy(buf, header, readsize); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
176 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
177 size_t read; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
178 do { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
179 read = romread(buf + readsize, 1, filesize - readsize, f); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
180 if (read > 0) { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
181 readsize += read; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
182 if (readsize == filesize) { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
183 int one_more = romgetc(f); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
184 if (one_more >= 0) { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
185 filesize *= 2; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
186 buf = realloc(buf, filesize); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
187 buf[readsize++] = one_more; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
188 } else { |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
189 read = 0; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
190 } |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
191 } |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
192 } |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
193 } while (read > 0); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
194 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
195 *dst = buf; |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
196 |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
197 romclose(f); |
f7fe240a7da6
Updated fibonacci benchmark code to work with current test harness
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
198 return readsize; |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
199 } |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
200 |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
201 |
186
02e25abe2dcd
Cleanup VINT code and fix bug in which VINT cycle would be set incorrectly after a VDP control port write
Mike Pavone <pavone@retrodev.com>
parents:
185
diff
changeset
|
202 |
198
209a37eed3e7
Add support for breaking into the debugger while game is running
Mike Pavone <pavone@retrodev.com>
parents:
197
diff
changeset
|
203 int break_on_sync = 0; |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
204 char *save_state_path; |
260
625f8e4d5fd2
Initial stab at integartiong Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
215
diff
changeset
|
205 |
832
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
206 |
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
207 |
592
4ff7bbb3943b
Get rest of emulator compiling again with Z80 core enabled
Michael Pavone <pavone@retrodev.com>
parents:
590
diff
changeset
|
208 |
483
3e1573fa22cf
Implement turbo/slow motion feature that overclocks or underclocks the entire system at the push of a button
Mike Pavone <pavone@retrodev.com>
parents:
482
diff
changeset
|
209 |
767
ea525f600b1d
SRAM detection from ROM header is no working correctly again
Michael Pavone <pavone@retrodev.com>
parents:
766
diff
changeset
|
210 char * save_filename; |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
211 system_header *current_system; |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
212 system_header *menu_system; |
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
213 system_header *game_system; |
767
ea525f600b1d
SRAM detection from ROM header is no working correctly again
Michael Pavone <pavone@retrodev.com>
parents:
766
diff
changeset
|
214 void persist_save() |
351
2f264d2a60c2
Support for SRAM with SEGA mapper. Half-finished support for SRAM without SEGA mapper.
Mike Pavone <pavone@retrodev.com>
parents:
346
diff
changeset
|
215 { |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
216 if (!game_system) { |
1009
883fe974f72b
Fix bug in which save RAM/EEPROM was not persisted correctly if the emulator is exited via the menu rather than the X button in the title bar
Michael Pavone <pavone@retrodev.com>
parents:
1008
diff
changeset
|
217 return; |
883fe974f72b
Fix bug in which save RAM/EEPROM was not persisted correctly if the emulator is exited via the menu rather than the X button in the title bar
Michael Pavone <pavone@retrodev.com>
parents:
1008
diff
changeset
|
218 } |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
219 game_system->persist_save(game_system); |
351
2f264d2a60c2
Support for SRAM with SEGA mapper. Half-finished support for SRAM without SEGA mapper.
Mike Pavone <pavone@retrodev.com>
parents:
346
diff
changeset
|
220 } |
2f264d2a60c2
Support for SRAM with SEGA mapper. Half-finished support for SRAM without SEGA mapper.
Mike Pavone <pavone@retrodev.com>
parents:
346
diff
changeset
|
221 |
764
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
222 char *title; |
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
223 void update_title(char *rom_name) |
340
58a085cfc6bd
Set window title based on ROM header name
Mike Pavone <pavone@retrodev.com>
parents:
338
diff
changeset
|
224 { |
764
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
225 if (title) { |
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
226 free(title); |
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
227 title = NULL; |
340
58a085cfc6bd
Set window title based on ROM header name
Mike Pavone <pavone@retrodev.com>
parents:
338
diff
changeset
|
228 } |
764
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
229 title = alloc_concat(rom_name, " - BlastEm"); |
874
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
230 render_update_caption(title); |
340
58a085cfc6bd
Set window title based on ROM header name
Mike Pavone <pavone@retrodev.com>
parents:
338
diff
changeset
|
231 } |
58a085cfc6bd
Set window title based on ROM header name
Mike Pavone <pavone@retrodev.com>
parents:
338
diff
changeset
|
232 |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
233 static char *get_save_dir(system_media *media) |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
234 { |
1326
071e761bcdcf
Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in
Michael Pavone <pavone@retrodev.com>
parents:
1295
diff
changeset
|
235 char *savedir_template = tern_find_path(config, "ui\0save_path\0", TVAL_PTR).ptrval; |
1295
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
236 if (!savedir_template) { |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
237 savedir_template = "$USERDATA/blastem/$ROMNAME"; |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
238 } |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
239 tern_node *vars = tern_insert_ptr(NULL, "ROMNAME", media->name); |
1295
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
240 vars = tern_insert_ptr(vars, "HOME", get_home_dir()); |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
241 vars = tern_insert_ptr(vars, "EXEDIR", get_exe_dir()); |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
242 vars = tern_insert_ptr(vars, "USERDATA", (char *)get_userdata_dir()); |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
243 char *save_dir = replace_vars(savedir_template, vars, 1); |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
244 tern_free(vars); |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
245 if (!ensure_dir_exists(save_dir)) { |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
246 warning("Failed to create save directory %s\n", save_dir); |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
247 } |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
248 return save_dir; |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
249 } |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
250 |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
251 void setup_saves(system_media *media, system_header *context) |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
252 { |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
253 static uint8_t persist_save_registered; |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
254 rom_info *info = &context->info; |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
255 char *save_dir = get_save_dir(info->is_save_lock_on ? media->chain : media); |
1395
efa7225e0f07
Initial work to support parallel NOR flash and the Magistr 16
Michael Pavone <pavone@retrodev.com>
parents:
1393
diff
changeset
|
256 char const *parts[] = {save_dir, PATH_SEP, info->save_type == SAVE_I2C ? "save.eeprom" : info->save_type == SAVE_NOR ? "save.nor" : "save.sram"}; |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
257 free(save_filename); |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
258 save_filename = alloc_concat_m(3, parts); |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
259 if (info->is_save_lock_on) { |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
260 //initial save dir was calculated based on lock-on cartridge because that's where the save device is |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
261 //save directory used for save states should still be located in the normal place |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
262 free(save_dir); |
1592
31effaadf877
Fix some memory errors (mostly leaks) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents:
1583
diff
changeset
|
263 parts[0] = save_dir = get_save_dir(media); |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
264 } |
1428
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
265 if (use_native_states || context->type != SYSTEM_GENESIS) { |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
266 parts[2] = "quicksave.state"; |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
267 } else { |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
268 parts[2] = "quicksave.gst"; |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
269 } |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
270 free(save_state_path); |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
271 save_state_path = alloc_concat_m(3, parts); |
956
f5550cdffe49
Saving the save directory in the rom_info struct didn't make sense. It should be in the console context.
Michael Pavone <pavone@retrodev.com>
parents:
955
diff
changeset
|
272 context->save_dir = save_dir; |
f5550cdffe49
Saving the save directory in the rom_info struct didn't make sense. It should be in the console context.
Michael Pavone <pavone@retrodev.com>
parents:
955
diff
changeset
|
273 if (info->save_type != SAVE_NONE) { |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
274 context->load_save(context); |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
275 if (!persist_save_registered) { |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
276 atexit(persist_save); |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
277 persist_save_registered = 1; |
956
f5550cdffe49
Saving the save directory in the rom_info struct didn't make sense. It should be in the console context.
Michael Pavone <pavone@retrodev.com>
parents:
955
diff
changeset
|
278 } |
f5550cdffe49
Saving the save directory in the rom_info struct didn't make sense. It should be in the console context.
Michael Pavone <pavone@retrodev.com>
parents:
955
diff
changeset
|
279 } |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
280 } |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
281 |
1573
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
282 void apply_updated_config(void) |
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
283 { |
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
284 render_config_updated(); |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
285 if (current_system && current_system->config_updated) { |
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
286 current_system->config_updated(current_system); |
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
287 } |
1573
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
288 } |
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
289 |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
290 static void on_drag_drop(const char *filename) |
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
291 { |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
292 if (current_system) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
293 if (current_system->next_rom) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
294 free(current_system->next_rom); |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
295 } |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
296 current_system->next_rom = strdup(filename); |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
297 current_system->request_exit(current_system); |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
298 if (menu_system && menu_system->type == SYSTEM_GENESIS) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
299 genesis_context *gen = (genesis_context *)menu_system; |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
300 if (gen->extra) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
301 menu_context *menu = gen->extra; |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
302 menu->external_game_load = 1; |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
303 } |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
304 } |
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
305 } else { |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
306 init_system_with_media(filename, SYSTEM_UNKNOWN); |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
307 } |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
308 #ifndef DISABLE_NUKLEAR |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
309 if (is_nuklear_active()) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
310 show_play_view(); |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
311 } |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
312 #endif |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
313 } |
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
314 |
1438
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
315 static system_media cart, lock_on; |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
316 void reload_media(void) |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
317 { |
1582
a74db49fa6b1
Added null check to reload_media
Michael Pavone <pavone@retrodev.com>
parents:
1581
diff
changeset
|
318 if (!current_system) { |
a74db49fa6b1
Added null check to reload_media
Michael Pavone <pavone@retrodev.com>
parents:
1581
diff
changeset
|
319 return; |
a74db49fa6b1
Added null check to reload_media
Michael Pavone <pavone@retrodev.com>
parents:
1581
diff
changeset
|
320 } |
1438
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
321 if (current_system->next_rom) { |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
322 free(current_system->next_rom); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
323 } |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
324 char const *parts[] = { |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
325 cart.dir, PATH_SEP, cart.name, ".", cart.extension |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
326 }; |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
327 char const **start = parts[0] ? parts : parts + 2; |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
328 int num_parts = parts[0] ? 5 : 3; |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
329 if (!parts[4]) { |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
330 num_parts--; |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
331 } |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
332 current_system->next_rom = alloc_concat_m(num_parts, start); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
333 current_system->request_exit(current_system); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
334 } |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
335 |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
336 void lockon_media(char *lock_on_path) |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
337 { |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
338 reload_media(); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
339 cart.chain = &lock_on; |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
340 free(lock_on.dir); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
341 free(lock_on.name); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
342 free(lock_on.extension); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
343 lock_on.dir = path_dirname(lock_on_path); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
344 lock_on.name = basename_no_extension(lock_on_path); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
345 lock_on.extension = path_extension(lock_on_path); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
346 lock_on.size = load_rom(lock_on_path, &lock_on.buffer, NULL); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
347 } |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
348 |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
349 static uint32_t opts = 0; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
350 static uint8_t force_region = 0; |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
351 void init_system_with_media(const char *path, system_type force_stype) |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
352 { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
353 if (game_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
354 game_system->persist_save(game_system); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
355 //swap to game context arena and mark all allocated pages in it free |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
356 if (current_system == menu_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
357 current_system->arena = set_current_arena(game_system->arena); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
358 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
359 mark_all_free(); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
360 game_system->free_context(game_system); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
361 } else if(current_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
362 //start a new arena and save old one in suspended system context |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
363 current_system->arena = start_new_arena(); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
364 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
365 system_type stype = SYSTEM_UNKNOWN; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
366 if (!(cart.size = load_rom(path, &cart.buffer, &stype))) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
367 fatal_error("Failed to open %s for reading\n", path); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
368 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
369 free(cart.dir); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
370 free(cart.name); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
371 free(cart.extension); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
372 cart.dir = path_dirname(path); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
373 cart.name = basename_no_extension(path); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
374 cart.extension = path_extension(path); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
375 if (force_stype != SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
376 stype = force_stype; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
377 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
378 if (stype == SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
379 stype = detect_system_type(&cart); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
380 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
381 if (stype == SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
382 fatal_error("Failed to detect system type for %s\n", path); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
383 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
384 //allocate new system context |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
385 game_system = alloc_config_system(stype, &cart, opts, force_region); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
386 if (!game_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
387 fatal_error("Failed to configure emulated machine for %s\n", path); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
388 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
389 if (menu_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
390 menu_system->next_context = game_system; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
391 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
392 game_system->next_context = menu_system; |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
393 setup_saves(&cart, game_system); |
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
394 update_title(game_system->info.name); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
395 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
396 |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
397 int main(int argc, char ** argv) |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
398 { |
496
6fc71114d145
Extract function to determine executable directory from load_config so it can be used elsewhere
Mike Pavone <pavone@retrodev.com>
parents:
488
diff
changeset
|
399 set_exe_str(argv[0]); |
6fc71114d145
Extract function to determine executable directory from load_config so it can be used elsewhere
Mike Pavone <pavone@retrodev.com>
parents:
488
diff
changeset
|
400 config = load_config(); |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
401 int width = -1; |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
402 int height = -1; |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
403 int debug = 0; |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
404 int loaded = 0; |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
405 system_type stype = SYSTEM_UNKNOWN, force_stype = SYSTEM_UNKNOWN; |
469
5f3344d0d42f
Fix argument handling so that the rom filename does not need to be specified first
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
406 char * romfname = NULL; |
425
8b3ae850d1c4
Forgot to null initialize the statfile pointer
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
407 char * statefile = NULL; |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
408 debugger_type dtype = DEBUGGER_NATIVE; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
409 uint8_t start_in_debugger = 0; |
860
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
410 uint8_t fullscreen = FULLSCREEN_DEFAULT, use_gl = 1; |
885
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
411 uint8_t debug_target = 0; |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
412 for (int i = 1; i < argc; i++) { |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
413 if (argv[i][0] == '-') { |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
414 switch(argv[i][1]) { |
505
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
415 case 'b': |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
416 i++; |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
417 if (i >= argc) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
418 fatal_error("-b must be followed by a frame count\n"); |
505
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
419 } |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
420 headless = 1; |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
421 exit_after = atoi(argv[i]); |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
422 break; |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
423 case 'd': |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
424 start_in_debugger = 1; |
885
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
425 //allow debugging the menu |
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
426 if (argv[i][2] == 'm') { |
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
427 debug_target = 1; |
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
428 } |
515
1495179d6737
Initial GDB remote debugging support. Lacks some features, but breakpoints and basic inspection of registers and memory work.
Mike Pavone <pavone@retrodev.com>
parents:
510
diff
changeset
|
429 break; |
1495179d6737
Initial GDB remote debugging support. Lacks some features, but breakpoints and basic inspection of registers and memory work.
Mike Pavone <pavone@retrodev.com>
parents:
510
diff
changeset
|
430 case 'D': |
1495179d6737
Initial GDB remote debugging support. Lacks some features, but breakpoints and basic inspection of registers and memory work.
Mike Pavone <pavone@retrodev.com>
parents:
510
diff
changeset
|
431 gdb_remote_init(); |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
432 dtype = DEBUGGER_GDB; |
1164
21df13266e6a
Restore functionality of the -D flag for GDB remote debugging
Michael Pavone <pavone@retrodev.com>
parents:
1140
diff
changeset
|
433 start_in_debugger = 1; |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
434 break; |
338
5c34a9c39394
Re-enable frame limit, but add a command line flag to disable it
Mike Pavone <pavone@retrodev.com>
parents:
336
diff
changeset
|
435 case 'f': |
860
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
436 fullscreen = !fullscreen; |
338
5c34a9c39394
Re-enable frame limit, but add a command line flag to disable it
Mike Pavone <pavone@retrodev.com>
parents:
336
diff
changeset
|
437 break; |
488
32f053ad9b02
Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents:
487
diff
changeset
|
438 case 'g': |
501
e1355aa80f4d
Use OpenGL by default. Add OpenGL switch to help text
Mike Pavone <pavone@retrodev.com>
parents:
496
diff
changeset
|
439 use_gl = 0; |
488
32f053ad9b02
Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents:
487
diff
changeset
|
440 break; |
197
7c227a8ec53d
Add instruction address logging to translator and support for reading an address log to the disassembler
Mike Pavone <pavone@retrodev.com>
parents:
195
diff
changeset
|
441 case 'l': |
1113
45db303fc705
Restore 68K address logging functionality
Michael Pavone <pavone@retrodev.com>
parents:
1111
diff
changeset
|
442 opts |= OPT_ADDRESS_LOG; |
197
7c227a8ec53d
Add instruction address logging to translator and support for reading an address log to the disassembler
Mike Pavone <pavone@retrodev.com>
parents:
195
diff
changeset
|
443 break; |
464 | 444 case 'v': |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
445 info_message("blastem %s\n", BLASTEM_VERSION); |
464 | 446 return 0; |
447 break; | |
265
c6d12878ea93
Add -n flag for disabling the Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
264
diff
changeset
|
448 case 'n': |
c6d12878ea93
Add -n flag for disabling the Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
264
diff
changeset
|
449 z80_enabled = 0; |
c6d12878ea93
Add -n flag for disabling the Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
264
diff
changeset
|
450 break; |
341
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
451 case 'r': |
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
452 i++; |
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
453 if (i >= argc) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
454 fatal_error("-r must be followed by region (J, U or E)\n"); |
341
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
455 } |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
456 force_region = translate_region_char(toupper(argv[i][0])); |
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
457 if (!force_region) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
458 fatal_error("'%c' is not a valid region character for the -r option\n", argv[i][0]); |
341
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
459 } |
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
460 break; |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
461 case 'm': |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
462 i++; |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
463 if (i >= argc) { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
464 fatal_error("-r must be followed by a machine type (sms, gen or jag)\n"); |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
465 } |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
466 if (!strcmp("sms", argv[i])) { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
467 stype = force_stype = SYSTEM_SMS; |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
468 } else if (!strcmp("gen", argv[i])) { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
469 stype = force_stype = SYSTEM_GENESIS; |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
470 } else if (!strcmp("jag", argv[i])) { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
471 stype = force_stype = SYSTEM_JAGUAR; |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
472 } else { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
473 fatal_error("Unrecognized machine type %s\n", argv[i]); |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
474 } |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
475 break; |
424
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
476 case 's': |
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
477 i++; |
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
478 if (i >= argc) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
479 fatal_error("-s must be followed by a savestate filename\n"); |
424
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
480 } |
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
481 statefile = argv[i]; |
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
482 break; |
832
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
483 case 't': |
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
484 force_no_terminal(); |
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
485 break; |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
405
diff
changeset
|
486 case 'y': |
1113
45db303fc705
Restore 68K address logging functionality
Michael Pavone <pavone@retrodev.com>
parents:
1111
diff
changeset
|
487 opts |= YM_OPT_WAVE_LOG; |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
405
diff
changeset
|
488 break; |
1016
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
489 case 'o': { |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
490 i++; |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
491 if (i >= argc) { |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
492 fatal_error("-o must be followed by a lock on cartridge filename\n"); |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
493 } |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
494 lock_on.size = load_rom(argv[i], &lock_on.buffer, NULL); |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
495 if (!lock_on.size) { |
1016
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
496 fatal_error("Failed to load lock on cartridge %s\n", argv[i]); |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
497 } |
1201
aee2177a1630
Use filename for game title in SMS mode
Michael Pavone <pavone@retrodev.com>
parents:
1190
diff
changeset
|
498 lock_on.name = basename_no_extension(argv[i]); |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
499 lock_on.extension = path_extension(argv[i]); |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
500 cart.chain = &lock_on; |
1016
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
501 break; |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
502 } |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
503 case 'h': |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
504 info_message( |
469
5f3344d0d42f
Fix argument handling so that the rom filename does not need to be specified first
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
505 "Usage: blastem [OPTIONS] ROMFILE [WIDTH] [HEIGHT]\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
506 "Options:\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
507 " -h Print this help text\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
508 " -r (J|U|E) Force region to Japan, US or Europe respectively\n" |
1223
a477cc22a960
Fix indentation of -m option
Michael Pavone <pavone@retrodev.com>
parents:
1201
diff
changeset
|
509 " -m MACHINE Force emulated machine type to MACHINE. Valid values are:\n" |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
510 " sms - Sega Master System/Mark III\n" |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
511 " gen - Sega Genesis/Megadrive\n" |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
512 " jag - Atari Jaguar\n" |
1017
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
513 " -f Toggles fullscreen mode\n" |
501
e1355aa80f4d
Use OpenGL by default. Add OpenGL switch to help text
Mike Pavone <pavone@retrodev.com>
parents:
496
diff
changeset
|
514 " -g Disable OpenGL rendering\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
515 " -s FILE Load a GST format savestate from FILE\n" |
1017
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
516 " -o FILE Load FILE as a lock-on cartridge\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
517 " -d Enter debugger on startup\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
518 " -n Disable Z80\n" |
501
e1355aa80f4d
Use OpenGL by default. Add OpenGL switch to help text
Mike Pavone <pavone@retrodev.com>
parents:
496
diff
changeset
|
519 " -v Display version number and exit\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
520 " -l Log 68K code addresses (useful for assemblers)\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
521 " -y Log individual YM-2612 channels to WAVE files\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
522 ); |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
523 return 0; |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
524 default: |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
525 fatal_error("Unrecognized switch %s\n", argv[i]); |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
526 } |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
527 } else if (!loaded) { |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
528 if (!(cart.size = load_rom(argv[i], &cart.buffer, stype == SYSTEM_UNKNOWN ? &stype : NULL))) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
529 fatal_error("Failed to open %s for reading\n", argv[i]); |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
530 } |
1438
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
531 cart.dir = path_dirname(argv[i]); |
1201
aee2177a1630
Use filename for game title in SMS mode
Michael Pavone <pavone@retrodev.com>
parents:
1190
diff
changeset
|
532 cart.name = basename_no_extension(argv[i]); |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
533 cart.extension = path_extension(argv[i]); |
469
5f3344d0d42f
Fix argument handling so that the rom filename does not need to be specified first
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
534 romfname = argv[i]; |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
535 loaded = 1; |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
536 } else if (width < 0) { |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
537 width = atoi(argv[i]); |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
538 } else if (height < 0) { |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
539 height = atoi(argv[i]); |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
540 } |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
541 } |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
542 |
1402
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
543 int def_width = 0, def_height = 0; |
1326
071e761bcdcf
Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in
Michael Pavone <pavone@retrodev.com>
parents:
1295
diff
changeset
|
544 char *config_width = tern_find_path(config, "video\0width\0", TVAL_PTR).ptrval; |
433
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
545 if (config_width) { |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
546 def_width = atoi(config_width); |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
547 } |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
548 if (!def_width) { |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
549 def_width = 640; |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
550 } |
1402
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
551 char *config_height = tern_find_path(config, "video\0height\0", TVAL_PTR).ptrval; |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
552 if (config_height) { |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
553 def_height = atoi(config_height); |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
554 } |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
555 if (!def_height) { |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
556 def_height = -1; |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
557 } |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
558 width = width < 1 ? def_width : width; |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
559 height = height < 1 ? def_height : height; |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
560 |
1326
071e761bcdcf
Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in
Michael Pavone <pavone@retrodev.com>
parents:
1295
diff
changeset
|
561 char *config_fullscreen = tern_find_path(config, "video\0fullscreen\0", TVAL_PTR).ptrval; |
1017
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
562 if (config_fullscreen && !strcmp("on", config_fullscreen)) { |
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
563 fullscreen = !fullscreen; |
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
564 } |
354
15dd6418fe67
Initial PSG support. Mostly works, noise channel is borked though.
Mike Pavone <pavone@retrodev.com>
parents:
351
diff
changeset
|
565 if (!headless) { |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
566 render_init(width, height, "BlastEm", fullscreen); |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
567 render_set_drag_drop_handler(on_drag_drop); |
342
13f994c88c34
Get frame time correct and frame rate sort of correct for EUR region
Mike Pavone <pavone@retrodev.com>
parents:
341
diff
changeset
|
568 } |
1583
430dd12e4010
Refactor to split device bindings from IO emulation code
Michael Pavone <pavone@retrodev.com>
parents:
1582
diff
changeset
|
569 set_bindings(); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
570 |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
571 uint8_t menu = !loaded; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
572 uint8_t use_nuklear = 0; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
573 #ifndef DISABLE_NUKLEAR |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
574 use_nuklear = is_nuklear_available(); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
575 #endif |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
576 if (!loaded && !use_nuklear) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
577 //load menu |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
578 romfname = tern_find_path(config, "ui\0rom\0", TVAL_PTR).ptrval; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
579 if (!romfname) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
580 romfname = "menu.bin"; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
581 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
582 if (is_absolute_path(romfname)) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
583 if (!(cart.size = load_rom(romfname, &cart.buffer, &stype))) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
584 fatal_error("Failed to open UI ROM %s for reading", romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
585 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
586 } else { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
587 cart.buffer = (uint16_t *)read_bundled_file(romfname, &cart.size); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
588 if (!cart.buffer) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
589 fatal_error("Failed to open UI ROM %s for reading", romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
590 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
591 uint32_t rom_size = nearest_pow2(cart.size); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
592 if (rom_size > cart.size) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
593 cart.buffer = realloc(cart.buffer, rom_size); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
594 cart.size = rom_size; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
595 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
596 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
597 //force system detection, value on command line is only for games not the menu |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
598 stype = detect_system_type(&cart); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
599 cart.dir = path_dirname(romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
600 cart.name = basename_no_extension(romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
601 cart.extension = path_extension(romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
602 loaded = 1; |
1128
093c19f34dfd
Detect failures to initialize a system context and report an error rather than crashing
Michael Pavone <pavone@retrodev.com>
parents:
1113
diff
changeset
|
603 } |
1428
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
604 char *state_format = tern_find_path(config, "ui\0state_format\0", TVAL_PTR).ptrval; |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
605 if (state_format && !strcmp(state_format, "gst")) { |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
606 use_native_states = 0; |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
607 } else if (state_format && strcmp(state_format, "native")) { |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
608 warning("%s is not a valid value for the ui.state_format setting. Valid values are gst and native\n", state_format); |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
609 } |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
610 |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
611 if (loaded) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
612 if (stype == SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
613 stype = detect_system_type(&cart); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
614 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
615 if (stype == SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
616 fatal_error("Failed to detect system type for %s\n", romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
617 } |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
618 current_system = alloc_config_system(stype, &cart, menu ? 0 : opts, force_region); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
619 if (!current_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
620 fatal_error("Failed to configure emulated machine for %s\n", romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
621 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
622 |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
623 setup_saves(&cart, current_system); |
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
624 update_title(current_system->info.name); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
625 if (menu) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
626 menu_system = current_system; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
627 } else { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
628 game_system = current_system; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
629 } |
874
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
630 } |
1474
c5c022c7aa54
Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
631 |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
632 #ifndef DISABLE_NUKLEAR |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
633 if (use_nuklear) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
634 blastem_nuklear_init(!menu); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
635 current_system = game_system; |
1486
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
636 menu = 0; |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
637 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
638 #endif |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
639 |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
640 current_system->debugger_type = dtype; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
641 current_system->enter_debugger = start_in_debugger && menu == debug_target; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
642 current_system->start_context(current_system, menu ? NULL : statefile); |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
643 for(;;) |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
644 { |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
645 if (current_system->should_exit) { |
949
5e4fb650de58
Make Exit option in menu work
Michael Pavone <pavone@retrodev.com>
parents:
940
diff
changeset
|
646 break; |
5e4fb650de58
Make Exit option in menu work
Michael Pavone <pavone@retrodev.com>
parents:
940
diff
changeset
|
647 } |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
648 if (current_system->next_rom) { |
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
649 char *next_rom = current_system->next_rom; |
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
650 current_system->next_rom = NULL; |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
651 init_system_with_media(next_rom, force_stype); |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
652 free(next_rom); |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
653 menu = 0; |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
654 current_system = game_system; |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
655 current_system->debugger_type = dtype; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
656 current_system->enter_debugger = start_in_debugger && menu == debug_target; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
657 current_system->start_context(current_system, statefile); |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
658 } else if (menu && game_system) { |
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
659 current_system->arena = set_current_arena(game_system->arena); |
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
660 current_system = game_system; |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
661 menu = 0; |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
662 current_system->resume_context(current_system); |
1486
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
663 } else if (!menu && (menu_system || use_nuklear)) { |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
664 if (use_nuklear) { |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
665 #ifndef DISABLE_NUKLEAR |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
666 ui_idle_loop(); |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
667 #endif |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
668 } else { |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
669 current_system->arena = set_current_arena(menu_system->arena); |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
670 current_system = menu_system; |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
671 menu = 1; |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
672 } |
1487
6a35815cc409
Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1486
diff
changeset
|
673 if (!current_system->next_rom) { |
6a35815cc409
Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1486
diff
changeset
|
674 current_system->resume_context(current_system); |
6a35815cc409
Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1486
diff
changeset
|
675 } |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
676 } else { |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
677 break; |
874
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
678 } |
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
679 } |
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
680 |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
681 return 0; |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
682 } |