From a0da6bcf43d71d22b949ccf1e68153b51da53e39 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 5 Sep 2012 00:55:19 +0300 Subject: [PATCH] Add aux1_descends to key change menu --- src/guiKeyChangeMenu.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp index 49b292df4..405a81e0b 100644 --- a/src/guiKeyChangeMenu.cpp +++ b/src/guiKeyChangeMenu.cpp @@ -37,7 +37,7 @@ enum { GUI_ID_BACK_BUTTON = 101, GUI_ID_ABORT_BUTTON, GUI_ID_SCROLL_BAR, - //buttons + // buttons GUI_ID_KEY_FORWARD_BUTTON, GUI_ID_KEY_BACKWARD_BUTTON, GUI_ID_KEY_LEFT_BUTTON, @@ -53,7 +53,9 @@ enum GUI_ID_KEY_DROP_BUTTON, GUI_ID_KEY_INVENTORY_BUTTON, GUI_ID_KEY_DUMP_BUTTON, - GUI_ID_KEY_RANGE_BUTTON + GUI_ID_KEY_RANGE_BUTTON, + // other + GUI_ID_CB_AUX1_DESCENDS, }; GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env, @@ -135,6 +137,18 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize) else offset += v2s32(0, 25); } + + { + s32 option_x = offset.X + 10; + s32 option_y = offset.Y; + u32 option_w = 180; + { + core::rect rect(0, 0, option_w, 30); + rect += topleft + v2s32(option_x, option_y); + Environment->addCheckBox(g_settings->getBool("aux1_descends"), rect, this, + GUI_ID_CB_AUX1_DESCENDS, wgettext("\"Use\" = climb down")); + } + } { core::rect < s32 > rect(0, 0, 100, 30); @@ -177,6 +191,11 @@ bool GUIKeyChangeMenu::acceptInput() key_setting *k = key_settings.at(i); g_settings->set(k->setting_name, k->key.sym()); } + { + gui::IGUIElement *e = getElementFromId(GUI_ID_CB_AUX1_DESCENDS); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + g_settings->setBool("aux1_descends", ((gui::IGUICheckBox*)e)->isChecked()); + } clearKeyCache(); return true; } -- 2.25.1