From 96020b3f89b56e0187adc115f0b71d014c67b100 Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 10 Jul 2020 11:03:52 +0200 Subject: [PATCH] ui: swap order of popup screens (gameinfo first, warnings second), add "press any key" to gameinfo --- src/frontend/mame/ui/ui.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp index e1b0990193b..f1744ff76e9 100644 --- a/src/frontend/mame/ui/ui.cpp +++ b/src/frontend/mame/ui/ui.cpp @@ -331,6 +331,16 @@ void mame_ui_manager::display_startup_screens(bool first_time) switch (state) { case 0: + if (show_gameinfo) + messagebox_text = machine_info().game_info_string(); + if (!messagebox_text.empty()) + { + messagebox_text.append("\n\nPress any key to continue"); + set_handler(ui_callback_type::MODAL, std::bind(&mame_ui_manager::handler_messagebox_anykey, this, _1)); + } + break; + + case 1: messagebox_text = machine_info().warnings_string(); m_has_warnings = !messagebox_text.empty(); if (m_has_warnings && show_warnings) @@ -341,13 +351,6 @@ void mame_ui_manager::display_startup_screens(bool first_time) } break; - case 1: - if (show_gameinfo) - messagebox_text = machine_info().game_info_string(); - if (!messagebox_text.empty()) - set_handler(ui_callback_type::MODAL, std::bind(&mame_ui_manager::handler_messagebox_anykey, this, _1)); - break; - case 2: std::vector> mandatory_images = mame_machine_manager::instance()->missing_mandatory_images(); if (!mandatory_images.empty() && show_mandatory_fileman)