Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typo doubletab -> doubletap

master
PilzAdam 2013-01-04 20:00:49 +01:00
parent bc879a1453
commit 615fd498bc
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minetest.conf.example
View File

@ -51,8 +51,8 @@
#keymap_screenshot = KEY_F12 #keymap_screenshot = KEY_F12
# If true, keymap_special1 instead of keymap_sneak is used for climbing down and descending # If true, keymap_special1 instead of keymap_sneak is used for climbing down and descending
#aux1_descends = false #aux1_descends = false
# Doubletabing the jump key toogles fly mode # Doubletaping the jump key toogles fly mode
#doubletab_jump = false #doubletap_jump = false
# Some (temporary) keys for debugging # Some (temporary) keys for debugging
#keymap_print_debug_stacks = KEY_KEY_P #keymap_print_debug_stacks = KEY_KEY_P
#keymap_quicktune_prev = KEY_HOME #keymap_quicktune_prev = KEY_HOME

2
src/defaultsettings.cpp
View File

@ -56,7 +56,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("anaglyph", "false"); settings->setDefault("anaglyph", "false");
settings->setDefault("anaglyph_strength", "0.1"); settings->setDefault("anaglyph_strength", "0.1");
settings->setDefault("aux1_descends", "false"); settings->setDefault("aux1_descends", "false");
settings->setDefault("doubletab_jump", "false"); settings->setDefault("doubletap_jump", "false");
// Some (temporary) keys for debugging // Some (temporary) keys for debugging
settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P"); settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");

4
src/game.cpp
View File

@ -1596,7 +1596,7 @@ void the_game(
input->step(dtime); input->step(dtime);
// Increase timer for doubleclick of "jump" // 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; jump_timer += dtime;
/* /*
@ -1690,7 +1690,7 @@ void the_game(
} }
else if(input->wasKeyDown(getKeySetting("keymap_jump"))) 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")) if(g_settings->getBool("free_move"))
{ {

10
src/guiKeyChangeMenu.cpp
View File

@ -57,7 +57,7 @@ enum
GUI_ID_KEY_RANGE_BUTTON, GUI_ID_KEY_RANGE_BUTTON,
// other // other
GUI_ID_CB_AUX1_DESCENDS, GUI_ID_CB_AUX1_DESCENDS,
GUI_ID_CB_DOUBLETAB_JUMP, GUI_ID_CB_DOUBLETAP_JUMP,
}; };
GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env, GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
@ -160,8 +160,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
{ {
core::rect<s32> rect(0, 0, option_w, 30); core::rect<s32> rect(0, 0, option_w, 30);
rect += topleft + v2s32(option_x, option_y); rect += topleft + v2s32(option_x, option_y);
Environment->addCheckBox(g_settings->getBool("doubletab_jump"), rect, this, Environment->addCheckBox(g_settings->getBool("doubletap_jump"), rect, this,
GUI_ID_CB_DOUBLETAB_JUMP, wgettext("Doubltab \"jump\" to toogle fly")); GUI_ID_CB_DOUBLETAP_JUMP, wgettext("Doubltap \"jump\" to toogle fly"));
} }
offset += v2s32(0, 25); offset += v2s32(0, 25);
} }
@ -213,9 +213,9 @@ bool GUIKeyChangeMenu::acceptInput()
g_settings->setBool("aux1_descends", ((gui::IGUICheckBox*)e)->isChecked()); 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) 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(); clearKeyCache();
return true; return true;