Dungeongen: Fix out-of-voxelmanip access segfault

[minetest.git] / src / guiKeyChangeMenu.cpp

diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index bb878d6efcc7ab9bf882990a89402e12826673b3..07137d1bc9be06446cf133d567f4a4c4a65d1178 100644 (file)
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -59,6 +59,7 @@ enum
        GUI_ID_KEY_INVENTORY_BUTTON,
        GUI_ID_KEY_DUMP_BUTTON,
        GUI_ID_KEY_RANGE_BUTTON,
+       GUI_ID_KEY_ZOOM_BUTTON,
        // other
        GUI_ID_CB_AUX1_DESCENDS,
        GUI_ID_CB_DOUBLETAP_JUMP,
@@ -137,7 +138,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                key_setting *k = key_settings.at(i);
                {
-                       core::rect < s32 > rect(0, 0, 110, 20);
+                       core::rect < s32 > rect(0, 0, 150, 20);
                        rect += topleft + v2s32(offset.X, offset.Y);
                        Environment->addStaticText(k->button_name, rect, false, true, this, -1);
                }
@@ -187,7 +188,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 
        {
                core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(size.X - 100 - 20, size.Y - 40);
+               rect += topleft + v2s32(size.X / 2 - 105, size.Y - 40);
                const wchar_t *text =  wgettext("Save");
                Environment->addButton(rect, this, GUI_ID_BACK_BUTTON,
                                 text);
@@ -195,7 +196,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        }
        {
                core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(size.X - 100 - 20 - 100 - 20, size.Y - 40);
+               rect += topleft + v2s32(size.X / 2 + 5, size.Y - 40);
                const wchar_t *text = wgettext("Cancel");
                Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
                                text);
@@ -414,5 +415,6 @@ void GUIKeyChangeMenu::init_keys()
        this->add_key(GUI_ID_KEY_NOCLIP_BUTTON,    wgettext("Toggle noclip"),    "keymap_noclip");
        this->add_key(GUI_ID_KEY_RANGE_BUTTON,     wgettext("Range select"),     "keymap_rangeselect");
        this->add_key(GUI_ID_KEY_DUMP_BUTTON,      wgettext("Print stacks"),     "keymap_print_debug_stacks");
+       this->add_key(GUI_ID_KEY_ZOOM_BUTTON,      wgettext("Zoom"),             "keymap_zoom");
 }