Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

get rid of some pointless members of input mapping menu (nw)

Browse Source
This commit is contained in:
Vas Crabb 2019-11-17 04:12:54 +11:00
parent 9773421bee
commit 80eb09f966
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/frontend/mame/ui/inputmap.cpp
View File

@ -226,12 +226,13 @@ menu_input_specific::~menu_input_specific()
/*-------------------------------------------------
menu_input - display a menu for inputs
-------------------------------------------------*/
menu_input::menu_input(mame_ui_manager &mui, render_container &container) : menu(mui, container), record_next(false)
menu_input::menu_input(mame_ui_manager &mui, render_container &container)
: menu(mui, container)
, data()
, pollingitem(nullptr)
, lastitem(nullptr)
, record_next(false)
{
lastitem = nullptr;
pollingitem = nullptr;
pollingref = nullptr;
pollingseq = SEQ_TYPE_STANDARD;
}
menu_input::~menu_input()
@ -328,12 +329,6 @@ void menu_input::handle()
/* if the menu is invalidated, clear it now */
if (invalidate)
{
pollingref = nullptr;
if (pollingitem != nullptr)
{
pollingref = pollingitem->ref;
pollingseq = pollingitem->seqtype;
}
reset(reset_options::REMEMBER_POSITION);
}
}
@ -396,9 +391,9 @@ void menu_input::populate_sorted()
text = "(" + text + ")";
/* if we're polling this item, use some spaces with left/right arrows */
if (pollingref == item.ref && pollingseq == item.seqtype)
if (&item == pollingitem)
{
subtext.assign(" ");
subtext = " ";
flags |= FLAG_LEFT_ARROW | FLAG_RIGHT_ARROW;
}
@ -410,7 +405,7 @@ void menu_input::populate_sorted()
}
/* add the item */
item_append(text, subtext, flags, &item);
item_append(std::move(text), std::move(subtext), flags, &item);
}
}

2
src/frontend/mame/ui/inputmap.h
View File

@ -64,8 +64,6 @@ protected:
void toggle_none_default(input_seq &selected_seq, input_seq &original_seq, const input_seq &selected_defseq);
data_vector data;
const void * pollingref;
input_seq_type pollingseq;
input_item_data * pollingitem;
private: