Fix typo doubletab -> doubletap
authorPilzAdam <PilzAdam@gmx.de>
Fri, 4 Jan 2013 19:00:49 +0000 (20:00 +0100)
committerPilzAdam <PilzAdam@gmx.de>
Fri, 4 Jan 2013 19:04:48 +0000 (20:04 +0100)
minetest.conf.example
src/defaultsettings.cpp
src/game.cpp
src/guiKeyChangeMenu.cpp

index a4448ab61d9403f36024ed968f626124aaae2058..5bb75bde4bdeebe104df5d20363ff3b114cebabe 100644 (file)
@@ -51,8 +51,8 @@
 #keymap_screenshot = KEY_F12
 # If true, keymap_special1 instead of keymap_sneak is used for climbing down and descending
 #aux1_descends = false
-# Doubletabing the jump key toogles fly mode
-#doubletab_jump = false
+# Doubletaping the jump key toogles fly mode
+#doubletap_jump = false
 # Some (temporary) keys for debugging
 #keymap_print_debug_stacks = KEY_KEY_P
 #keymap_quicktune_prev = KEY_HOME
index 82783db0d27cec472814ea42d134628a81c2d168..75fea84c80d2a23a4a8dc23afb6548ad6095ca5f 100644 (file)
@@ -56,7 +56,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("anaglyph", "false");
        settings->setDefault("anaglyph_strength", "0.1");
        settings->setDefault("aux1_descends", "false");
-       settings->setDefault("doubletab_jump", "false");
+       settings->setDefault("doubletap_jump", "false");
 
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
index ab480c3db7e459e648e7f45ffd1d67e017e34c4a..ca992c05618cd00f898e71050b58b0727a7a68a5 100644 (file)
@@ -1596,7 +1596,7 @@ void the_game(
                input->step(dtime);
 
                // Increase timer for doubleclick of "jump"
-               if(g_settings->getBool("doubletab_jump") && jump_timer <= 0.2)
+               if(g_settings->getBool("doubletap_jump") && jump_timer <= 0.2)
                        jump_timer += dtime;
 
                /*
@@ -1690,7 +1690,7 @@ void the_game(
                }
                else if(input->wasKeyDown(getKeySetting("keymap_jump")))
                {
-                       if(g_settings->getBool("doubletab_jump") && jump_timer < 0.2)
+                       if(g_settings->getBool("doubletap_jump") && jump_timer < 0.2)
                        {
                                if(g_settings->getBool("free_move"))
                                {
index 336b13e0727aeda4d54a84cbd275a8dfe1cbabcd..51a14d64727d87ccce5b381a7b70994ae24e3a02 100644 (file)
@@ -57,7 +57,7 @@ enum
        GUI_ID_KEY_RANGE_BUTTON,
        // other
        GUI_ID_CB_AUX1_DESCENDS,
-       GUI_ID_CB_DOUBLETAB_JUMP,
+       GUI_ID_CB_DOUBLETAP_JUMP,
 };
 
 GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
@@ -160,8 +160,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
                {
                        core::rect<s32> rect(0, 0, option_w, 30);
                        rect += topleft + v2s32(option_x, option_y);
-                       Environment->addCheckBox(g_settings->getBool("doubletab_jump"), rect, this,
-                                       GUI_ID_CB_DOUBLETAB_JUMP, wgettext("Doubltab \"jump\" to toogle fly"));
+                       Environment->addCheckBox(g_settings->getBool("doubletap_jump"), rect, this,
+                                       GUI_ID_CB_DOUBLETAP_JUMP, wgettext("Doubltap \"jump\" to toogle fly"));
                }
                offset += v2s32(0, 25);
        }
@@ -213,9 +213,9 @@ bool GUIKeyChangeMenu::acceptInput()
                        g_settings->setBool("aux1_descends", ((gui::IGUICheckBox*)e)->isChecked());
        }
        {
-               gui::IGUIElement *e = getElementFromId(GUI_ID_CB_DOUBLETAB_JUMP);
+               gui::IGUIElement *e = getElementFromId(GUI_ID_CB_DOUBLETAP_JUMP);
                if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
-                       g_settings->setBool("doubletab_jump", ((gui::IGUICheckBox*)e)->isChecked());
+                       g_settings->setBool("doubletap_jump", ((gui::IGUICheckBox*)e)->isChecked());
        }
        clearKeyCache();
        return true;