diff options
| author | rubenwardy <rw@rubenwardy.com> | 2019-04-03 21:37:30 +0100 |
|---|---|---|
| committer | Paramat <paramat@users.noreply.github.com> | 2019-04-03 21:37:30 +0100 |
| commit | 4f7674d448abb9f12030c743a1a6a0d3ad07ad7c (patch) | |
| tree | 120d1874926fdd05a644270f772de3ed4090e116 /src | |
| parent | a4677496f347a3c9bd66b39ca535f8346bac1708 (diff) | |
| download | minetest-4f7674d448abb9f12030c743a1a6a0d3ad07ad7c.tar.gz minetest-4f7674d448abb9f12030c743a1a6a0d3ad07ad7c.tar.bz2 minetest-4f7674d448abb9f12030c743a1a6a0d3ad07ad7c.zip | |
Change pitch fly binding to 'P', add to change keys menu (#8314)
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaultsettings.cpp | 2 | ||||
| -rw-r--r-- | src/gui/guiKeyChangeMenu.cpp | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 5a56f3d77..2e8fffbd1 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -82,7 +82,7 @@ void set_default_settings(Settings *settings) settings->setDefault("keymap_console", "KEY_F10"); settings->setDefault("keymap_rangeselect", "KEY_KEY_R"); settings->setDefault("keymap_freemove", "KEY_KEY_K"); - settings->setDefault("keymap_pitchmove", "KEY_KEY_L"); + settings->setDefault("keymap_pitchmove", "KEY_KEY_P"); settings->setDefault("keymap_fastmove", "KEY_KEY_J"); settings->setDefault("keymap_noclip", "KEY_KEY_H"); settings->setDefault("keymap_hotbar_next", "KEY_KEY_N"); diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp index 1a41e5828..ca331a7d4 100644 --- a/src/gui/guiKeyChangeMenu.cpp +++ b/src/gui/guiKeyChangeMenu.cpp @@ -50,7 +50,7 @@ enum GUI_ID_KEY_FAST_BUTTON, GUI_ID_KEY_JUMP_BUTTON, GUI_ID_KEY_NOCLIP_BUTTON, - GUI_ID_KEY_CINEMATIC_BUTTON, + GUI_ID_KEY_PITCH_MOVE, GUI_ID_KEY_CHAT_BUTTON, GUI_ID_KEY_CMD_BUTTON, GUI_ID_KEY_CMD_LOCAL_BUTTON, @@ -119,9 +119,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize) const float s = m_gui_scale; DesiredRect = core::rect<s32>( - screensize.X / 2 - 745 * s / 2, + screensize.X / 2 - 835 * s / 2, screensize.Y / 2 - 430 * s / 2, - screensize.X / 2 + 745 * s / 2, + screensize.X / 2 + 835 * s / 2, screensize.Y / 2 + 430 * s / 2 ); recalculateAbsolutePosition(false); @@ -155,13 +155,13 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize) { core::rect<s32> rect(0, 0, 100 * s, 30 * s); - rect += topleft + v2s32(offset.X + 120 * s, offset.Y - 5 * s); + rect += topleft + v2s32(offset.X + 150 * s, offset.Y - 5 * s); const wchar_t *text = wgettext(k->key.name()); k->button = Environment->addButton(rect, this, k->id, text); delete[] text; } if ((i + 1) % KMaxButtonPerColumns == 0) { - offset.X += 230 * s; + offset.X += 260 * s; offset.Y = 60 * s; } else { offset += v2s32(0, 25 * s); @@ -430,9 +430,9 @@ void GUIKeyChangeMenu::init_keys() this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"), "keymap_hotbar_next"); this->add_key(GUI_ID_KEY_ZOOM_BUTTON, wgettext("Zoom"), "keymap_zoom"); this->add_key(GUI_ID_KEY_CAMERA_BUTTON, wgettext("Change camera"), "keymap_camera_mode"); - this->add_key(GUI_ID_KEY_CINEMATIC_BUTTON, wgettext("Toggle Cinematic"), "keymap_cinematic"); this->add_key(GUI_ID_KEY_MINIMAP_BUTTON, wgettext("Toggle minimap"), "keymap_minimap"); this->add_key(GUI_ID_KEY_FLY_BUTTON, wgettext("Toggle fly"), "keymap_freemove"); + this->add_key(GUI_ID_KEY_PITCH_MOVE, wgettext("Toggle pitchmove"), "keymap_pitchmove"); this->add_key(GUI_ID_KEY_FAST_BUTTON, wgettext("Toggle fast"), "keymap_fastmove"); this->add_key(GUI_ID_KEY_NOCLIP_BUTTON, wgettext("Toggle noclip"), "keymap_noclip"); this->add_key(GUI_ID_KEY_MUTE_BUTTON, wgettext("Mute"), "keymap_mute"); @@ -451,4 +451,3 @@ void GUIKeyChangeMenu::init_keys() this->add_key(GUI_ID_KEY_CHATLOG_BUTTON, wgettext("Toggle chat log"), "keymap_toggle_chat"); this->add_key(GUI_ID_KEY_FOG_BUTTON, wgettext("Toggle fog"), "keymap_toggle_fog"); } - |