From 827770a438a2ab7b956698e6c65ead7f53f3f247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Sat, 9 Feb 2013 18:46:19 +0000 Subject: [PATCH] reduced tagmap lookups in ui_update_and_render() / changed ui_is_menu_active() to bool (nw) --- src/emu/ui.c | 6 +++--- src/emu/ui.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emu/ui.c b/src/emu/ui.c index edc6f206ec0..046ed0b8fe6 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -437,7 +437,7 @@ void ui_update_and_render(running_machine &machine, render_container *container) else popup_text_end = 0; - if (ui_mouse_show || (machine.options().ui_mouse() && ui_is_menu_active())) + if (ui_mouse_show || (ui_is_menu_active() && machine.options().ui_mouse())) { INT32 mouse_target_x, mouse_target_y; int mouse_button; @@ -924,11 +924,11 @@ void ui_show_mouse(bool status) } /*------------------------------------------------- - ui_is_menu_active - return TRUE if the menu + ui_is_menu_active - return true if the menu UI handler is active -------------------------------------------------*/ -int ui_is_menu_active(void) +bool ui_is_menu_active(void) { return (ui_handler_callback == ui_menu::ui_handler); } diff --git a/src/emu/ui.h b/src/emu/ui.h index dbca4a91c52..e31f0072420 100644 --- a/src/emu/ui.h +++ b/src/emu/ui.h @@ -172,7 +172,7 @@ void ui_show_menu(void); void ui_show_mouse(bool status); /* return true if a menu is displayed */ -int ui_is_menu_active(void); +bool ui_is_menu_active(void); /* print the game info string into a buffer */ astring &game_info_astring(running_machine &machine, astring &string);