From 615fd498bc04fce67aa72549536d38b503d7d570 Mon Sep 17 00:00:00 2001
From: PilzAdam <PilzAdam@gmx.de>
Date: Fri, 4 Jan 2013 20:00:49 +0100
Subject: [PATCH] Fix typo doubletab -> doubletap
---
minetest.conf.example | 4 ++--
src/defaultsettings.cpp | 2 +-
src/game.cpp | 4 ++--
src/guiKeyChangeMenu.cpp | 10 +++++-----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/minetest.conf.example b/minetest.conf.example
index a4448ab61..5bb75bde4 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -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
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 82783db0d..75fea84c8 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -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");
diff --git a/src/game.cpp b/src/game.cpp
index ab480c3db..ca992c056 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -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"))
{
diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 336b13e07..51a14d647 100644
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -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;
--
GitLab