Mgv5/v7/flat/fractal: Move tunnel noise calculation into generateCaves

[minetest.git] / src / guiKeyChangeMenu.cpp

diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 008ac8c5d6ab996cc147c2b0dd64f9189834e98e..bb878d6efcc7ab9bf882990a89402e12826673b3 100644 (file)
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -81,7 +81,7 @@ GUIKeyChangeMenu::~GUIKeyChangeMenu()
        removeChildren();
 
        for (std::vector<key_setting*>::iterator iter = key_settings.begin();
-                       iter != key_settings.end(); iter ++) {
+                       iter != key_settings.end(); ++iter) {
                delete[] (*iter)->button_name;
                delete (*iter);
        }
@@ -269,8 +269,7 @@ bool GUIKeyChangeMenu::resetMenu()
 bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
 {
        if (event.EventType == EET_KEY_INPUT_EVENT && activeKey >= 0
-               && event.KeyInput.PressedDown)
-       {
+                       && event.KeyInput.PressedDown) {
                
                bool prefer_character = shift_down;
                KeyPress kp(event.KeyInput, prefer_character);
@@ -328,9 +327,12 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                                return true;
                        }
                }
-       }
-       if (event.EventType == EET_GUI_EVENT)
-       {
+       } else if (event.EventType == EET_KEY_INPUT_EVENT && activeKey < 0
+                       && event.KeyInput.PressedDown
+                       && event.KeyInput.Key == irr::KEY_ESCAPE) {
+               quitMenu();
+               return true;
+       } else if (event.EventType == EET_GUI_EVENT) {
                if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST
                        && isVisible())
                {