Mercurial > repos > blastem
changeset 1475:afa3fbb76bff nuklear_ui
Basic support for loading ROMs via Nuklear UI
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Tue, 21 Nov 2017 23:11:11 -0800 |
parents | c5c022c7aa54 |
children | 0646ae0987c3 |
files | m68k_core.c nuklear_ui/blastem_nuklear.c |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/m68k_core.c Tue Nov 21 19:07:43 2017 -0800 +++ b/m68k_core.c Tue Nov 21 23:11:11 2017 -0800 @@ -1168,7 +1168,6 @@ { code_ptr addr = get_native_address_trans(context, address); m68k_options * options = context->options; - context->should_return = 0; options->start_context(addr, context); }
--- a/nuklear_ui/blastem_nuklear.c Tue Nov 21 19:07:43 2017 -0800 +++ b/nuklear_ui/blastem_nuklear.c Tue Nov 21 23:11:11 2017 -0800 @@ -48,15 +48,16 @@ } nk_layout_row_static(context, 52, 300, 1); if (nk_button_label(context, "Open")) { + char const *pieces[] = {current_path, PATH_SEP, entries[selected_entry].name}; if (entries[selected_entry].is_dir) { char *old = current_path; - char const *pieces[] = {old, PATH_SEP, entries[selected_entry].name}; current_path = alloc_concat_m(3, pieces); free(old); free_dir_list(entries, num_entries); entries = NULL; } else { - //TODO: load ROM + current_system->next_rom = alloc_concat_m(3, pieces); + current_system->request_exit(current_system); current_view = view_play; } }