From 9044a19d782cc66e0af3e8a79fe4889b9bd0f4e5 Mon Sep 17 00:00:00 2001 From: Kp Date: Mon, 28 Jun 2021 03:37:50 +0000 Subject: [PATCH] Fold passive_messagebox_item into passive_messagebox --- common/main/newmenu.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/common/main/newmenu.h b/common/main/newmenu.h index 911dae7da..2bbeed735 100644 --- a/common/main/newmenu.h +++ b/common/main/newmenu.h @@ -612,20 +612,11 @@ static inline void nm_set_item_slider(newmenu_item &ni, const char *text, unsign new(&ni.nm_private.slider) newmenu_item::slider_specific_type({low, high}, saved_text); } -struct passive_messagebox_item -{ - std::array m; - passive_messagebox_item(const char *const item) : - m{{newmenu_item::nm_item_menu{item}}} - { - } -}; - -struct passive_messagebox : passive_messagebox_item, passive_newmenu +struct passive_messagebox : std::array, newmenu { passive_messagebox(const menu_title title, const menu_subtitle subtitle, const char *const item, grs_canvas &src) : - passive_messagebox_item(item), - passive_newmenu(title, subtitle, menu_filename{nullptr}, tiny_mode_flag::normal, tab_processing_flag::ignore, adjusted_citem::create(m, 0), src) + std::array{{newmenu_item::nm_item_menu{item}}}, + newmenu(title, subtitle, menu_filename{nullptr}, tiny_mode_flag::normal, tab_processing_flag::ignore, adjusted_citem::create(*this, 0), src) { } };