Mercurial > repos > blastem
diff blastem.c @ 1486:a6881d0d76d0 nuklear_ui
Pause game execution when in the new UI pause menu
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sun, 26 Nov 2017 19:22:09 -0800 |
parents | 001120e91fed |
children | 6a35815cc409 |
line wrap: on
line diff
--- a/blastem.c Sun Nov 26 18:33:36 2017 -0800 +++ b/blastem.c Sun Nov 26 19:22:09 2017 -0800 @@ -525,6 +525,7 @@ if (use_nuklear) { blastem_nuklear_init(!menu); current_system = game_system; + menu = 0; } #endif @@ -551,10 +552,16 @@ current_system = game_system; menu = 0; current_system->resume_context(current_system); - } else if (!menu && menu_system) { - current_system->arena = set_current_arena(menu_system->arena); - current_system = menu_system; - menu = 1; + } else if (!menu && (menu_system || use_nuklear)) { + if (use_nuklear) { +#ifndef DISABLE_NUKLEAR + ui_idle_loop(); +#endif + } else { + current_system->arena = set_current_arena(menu_system->arena); + current_system = menu_system; + menu = 1; + } current_system->resume_context(current_system); } else { break;