diff options
author | Michael Pavone <pavone@retrodev.com> | 2017-11-26 19:22:09 -0800 |
---|---|---|
committer | Michael Pavone <pavone@retrodev.com> | 2017-11-26 19:22:09 -0800 |
commit | 3b2e343a1088abc7fe1cf1dffcf6a20aa97b0918 (patch) | |
tree | bb20356ceec8dc748277ff7a6f8c285f2324db93 /blastem.c | |
parent | c9b253c58788376865cc8768ba342a67b4758bcf (diff) |
Pause game execution when in the new UI pause menu
--HG--
branch : nuklear_ui
Diffstat (limited to 'blastem.c')
-rw-r--r-- | blastem.c | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -525,6 +525,7 @@ int main(int argc, char ** argv) if (use_nuklear) { blastem_nuklear_init(!menu); current_system = game_system; + menu = 0; } #endif @@ -551,10 +552,16 @@ int main(int argc, char ** argv) 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; |