Mercurial > repos > blastem

comparison blastem.c @ 1486:a6881d0d76d0 nuklear_ui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1485:369da70ee2c2 1486:a6881d0d76d0
523 523
524 #ifndef DISABLE_NUKLEAR 524 #ifndef DISABLE_NUKLEAR
525 if (use_nuklear) { 525 if (use_nuklear) {
526 blastem_nuklear_init(!menu); 526 blastem_nuklear_init(!menu);
527 current_system = game_system; 527 current_system = game_system;
528 menu = 0;
528 } 529 }
529 #endif 530 #endif
530 531
531 current_system->debugger_type = dtype; 532 current_system->debugger_type = dtype;
532 current_system->enter_debugger = start_in_debugger && menu == debug_target; 533 current_system->enter_debugger = start_in_debugger && menu == debug_target;
549 } else if (menu && game_system) { 550 } else if (menu && game_system) {
550 current_system->arena = set_current_arena(game_system->arena); 551 current_system->arena = set_current_arena(game_system->arena);
551 current_system = game_system; 552 current_system = game_system;
552 menu = 0; 553 menu = 0;
553 current_system->resume_context(current_system); 554 current_system->resume_context(current_system);
554 } else if (!menu && menu_system) { 555 } else if (!menu && (menu_system || use_nuklear)) {
555 current_system->arena = set_current_arena(menu_system->arena); 556 if (use_nuklear) {
556 current_system = menu_system; 557 #ifndef DISABLE_NUKLEAR
557 menu = 1; 558 ui_idle_loop();
559 #endif
560 } else {
561 current_system->arena = set_current_arena(menu_system->arena);
562 current_system = menu_system;
563 menu = 1;
564 }
558 current_system->resume_context(current_system); 565 current_system->resume_context(current_system);
559 } else { 566 } else {
560 break; 567 break;
561 } 568 }
562 } 569 }