diff options
author | 2012-05-07 06:38:35 +0000 | |
---|---|---|
committer | 2012-05-07 06:38:35 +0000 | |
commit | 0a119e20fe95c08f11d54329e5e2413772abad7e (patch) | |
tree | e5a0960485020b27f2a532098fce39e4e719df2a /src/emu/uimain.c | |
parent | fe12de0fc82a50e90a9cdf978544f1caa5d94e5f (diff) |
Fix issue where changes to the default input config did not
apply to the game-specific config.
Also fixed none/default toggle for game-specific configs.
Diffstat (limited to 'src/emu/uimain.c')
-rw-r--r-- | src/emu/uimain.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/emu/uimain.c b/src/emu/uimain.c index 48538e7a573..5167149adb4 100644 --- a/src/emu/uimain.c +++ b/src/emu/uimain.c @@ -763,7 +763,7 @@ void ui_menu_input_specific::populate() if(pollingitem && pollingref == field && pollingseq == seqtype) pollingitem = item; item->seq = field->seq(seqtype); - item->defseq = &get_field_default_seq(field, seqtype); + item->defseq = &field->defseq(seqtype); item->sortorder = sortorder + suborder[seqtype]; item->type = field->is_analog() ? (INPUT_TYPE_ANALOG + seqtype) : INPUT_TYPE_DIGITAL; item->name = name; @@ -815,19 +815,6 @@ void ui_menu_input::toggle_none_default(input_seq &selected_seq, input_seq &orig selected_seq.reset(); } -/*------------------------------------------------- - get_field_default_seq - return a pointer - to the default sequence for the given field --------------------------------------------------*/ - -const input_seq &ui_menu_input::get_field_default_seq(ioport_field *field, input_seq_type seqtype) -{ - if (field->seq(seqtype).is_default()) - return field->machine().ioport().type_seq(field->type(), field->player(), seqtype); - else - return field->seq(seqtype); -} - void ui_menu_input::handle() { input_item_data *seqchangeditem = NULL; |