summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-02-14 08:09:59 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-02-14 08:09:59 +0000
commit6b3dc3d421eb62b8bad5b6090f514baeaa06d7a2 (patch)
tree86b576a87dca508ac60b07364d6b3d29ad33ea24
parent6ee5fc726a8bae328f8a61fce79cb3851696cd4b (diff)
Minor function rename.
-rw-r--r--src/emu/inptport.c4
-rw-r--r--src/emu/inptport.h2
-rw-r--r--src/emu/ui.c6
-rw-r--r--src/emu/uimenu.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 5821cce91b1..8bace7a0f4c 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -4641,7 +4641,7 @@ static void record_port(const input_port_config *port)
}
}
-int input_machine_have_keyboard(running_machine *machine)
+int input_machine_has_keyboard(running_machine *machine)
{
const input_field_config *field;
const input_port_config *port;
@@ -4911,7 +4911,7 @@ void inputx_init(running_machine *machine)
}
/* posting keys directly only makes sense for a computer */
- if (input_machine_have_keyboard(machine))
+ if (input_machine_has_keyboard(machine))
{
codes = build_codes(machine, machine->portlist.first());
setup_keybuffer(machine);
diff --git a/src/emu/inptport.h b/src/emu/inptport.h
index 9f08132a6d8..93cfd669fcb 100644
--- a/src/emu/inptport.h
+++ b/src/emu/inptport.h
@@ -1156,7 +1156,7 @@ int input_condition_true(running_machine *machine, const input_condition *condit
const char *input_port_string_from_token(const input_port_token token);
/* return TRUE if machine use full keyboard emulation */
-int input_machine_have_keyboard(running_machine *machine);
+int input_machine_has_keyboard(running_machine *machine);
/* these are called by the core; they should not be called from FEs */
void inputx_init(running_machine *machine);
diff --git a/src/emu/ui.c b/src/emu/ui.c
index 972e23176fa..c6df5d95e79 100644
--- a/src/emu/ui.c
+++ b/src/emu/ui.c
@@ -931,7 +931,7 @@ static astring &warnings_string(running_machine *machine, astring &string)
string.cat("There are known problems with this " GAMENOUN "\n\n");
/* add one line per warning flag */
- if (input_machine_have_keyboard(machine))
+ if (input_machine_has_keyboard(machine))
string.cat("The keyboard emulation may not be 100% accurate.\n");
if (machine->gamedrv->flags & GAME_IMPERFECT_COLORS)
string.cat("The colors aren't 100% accurate.\n");
@@ -1300,10 +1300,10 @@ static UINT32 handler_ingame(running_machine *machine, render_container *contain
}
/* determine if we should disable the rest of the UI */
- int ui_disabled = ui_use_new_ui() || (input_machine_have_keyboard(machine) && !ui_active);
+ int ui_disabled = ui_use_new_ui() || (input_machine_has_keyboard(machine) && !ui_active);
/* is ScrLk UI toggling applicable here? */
- if (!ui_use_new_ui() && input_machine_have_keyboard(machine))
+ if (!ui_use_new_ui() && input_machine_has_keyboard(machine))
{
/* are we toggling the UI with ScrLk? */
if (ui_input_pressed(machine, IPT_UI_TOGGLE_UI))
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index 1ba95c11e11..671e34dfc56 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -1536,8 +1536,8 @@ static void menu_main_populate(running_machine *machine, ui_menu *menu, void *st
#endif /* MESS */
/* add keyboard mode menu */
- if (input_machine_have_keyboard(machine) && inputx_can_post(machine))
- ui_menu_item_append(menu, "Keyboard Mode", NULL, 0, (void*)ui_menu_keyboard_mode);
+ if (input_machine_has_keyboard(machine) && inputx_can_post(machine))
+ ui_menu_item_append(menu, "Keyboard Mode", NULL, 0, (void *)ui_menu_keyboard_mode);
/* add sliders menu */
ui_menu_item_append(menu, "Slider Controls", NULL, 0, (void *)menu_sliders);