summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/input.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/input.c')
-rw-r--r--src/emu/input.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/input.c b/src/emu/input.c
index 7f6a681abee..40d09320fda 100644
--- a/src/emu/input.c
+++ b/src/emu/input.c
@@ -591,24 +591,24 @@ void input_init(running_machine *machine)
/* read input enable options */
device_list[DEVICE_CLASS_KEYBOARD].enabled = TRUE;
- device_list[DEVICE_CLASS_MOUSE].enabled = options_get_bool(&machine->options(), OPTION_MOUSE);
- device_list[DEVICE_CLASS_LIGHTGUN].enabled = options_get_bool(&machine->options(), OPTION_LIGHTGUN);
- device_list[DEVICE_CLASS_JOYSTICK].enabled = options_get_bool(&machine->options(), OPTION_JOYSTICK);
+ device_list[DEVICE_CLASS_MOUSE].enabled = machine->options().mouse();
+ device_list[DEVICE_CLASS_LIGHTGUN].enabled = machine->options().lightgun();
+ device_list[DEVICE_CLASS_JOYSTICK].enabled = machine->options().joystick();
/* read input device multi options */
- device_list[DEVICE_CLASS_KEYBOARD].multi = options_get_bool(&machine->options(), OPTION_MULTIKEYBOARD);
- device_list[DEVICE_CLASS_MOUSE].multi = options_get_bool(&machine->options(), OPTION_MULTIMOUSE);
+ device_list[DEVICE_CLASS_KEYBOARD].multi = machine->options().multi_keyboard();
+ device_list[DEVICE_CLASS_MOUSE].multi = machine->options().multi_mouse();
device_list[DEVICE_CLASS_LIGHTGUN].multi = TRUE;
device_list[DEVICE_CLASS_JOYSTICK].multi = TRUE;
/* read other input options */
- state->steadykey_enabled = options_get_bool(&machine->options(), OPTION_STEADYKEY);
- state->lightgun_reload_button = options_get_bool(&machine->options(), OPTION_OFFSCREEN_RELOAD);
- state->joystick_deadzone = (INT32)(options_get_float(&machine->options(), OPTION_JOYSTICK_DEADZONE) * INPUT_ABSOLUTE_MAX);
- state->joystick_saturation = (INT32)(options_get_float(&machine->options(), OPTION_JOYSTICK_SATURATION) * INPUT_ABSOLUTE_MAX);
+ state->steadykey_enabled = machine->options().steadykey();
+ state->lightgun_reload_button = machine->options().offscreen_reload();
+ state->joystick_deadzone = (INT32)(machine->options().joystick_deadzone() * INPUT_ABSOLUTE_MAX);
+ state->joystick_saturation = (INT32)(machine->options().joystick_saturation() * INPUT_ABSOLUTE_MAX);
/* get the default joystick map */
- state->joystick_map_default = options_get_string(&machine->options(), OPTION_JOYSTICK_MAP);
+ state->joystick_map_default = machine->options().joystick_map();
if (state->joystick_map_default[0] == 0 || strcmp(state->joystick_map_default, "auto") == 0)
state->joystick_map_default = joystick_map_8way;
if (!joystick_map_parse(state->joystick_map_default, &map))