diff options
author | 2019-11-17 04:12:54 +1100 | |
---|---|---|
committer | 2019-11-17 04:12:54 +1100 | |
commit | 80eb09f9666984a3ae957949f932567e20596021 (patch) | |
tree | 5f6b1395c576b64d12ac692bde65ff30d84f1250 /src/frontend/mame/ui/inputmap.cpp | |
parent | 9773421beea4f62d410bd970a5d4a7acf413be36 (diff) |
get rid of some pointless members of input mapping menu (nw)
Diffstat (limited to 'src/frontend/mame/ui/inputmap.cpp')
-rw-r--r-- | src/frontend/mame/ui/inputmap.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp index 6d7c1b138a1..8dcfb597126 100644 --- a/src/frontend/mame/ui/inputmap.cpp +++ b/src/frontend/mame/ui/inputmap.cpp @@ -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); } } |