Skip to content

Commit 4f7674d

Browse files
rubenwardyparamat
authored andcommittedApr 3, 2019
Change pitch fly binding to 'P', add to change keys menu (#8314)
1 parent a467749 commit 4f7674d

File tree

4 files changed

+30
-32
lines changed

4 files changed

+30
-32
lines changed
 

Diff for: ‎builtin/settingtypes.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ keymap_freemove (Fly key) key KEY_KEY_K
212212

213213
# Key for toggling pitch move mode.
214214
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
215-
keymap_pitchmove (Pitch move key) key KEY_KEY_L
215+
keymap_pitchmove (Pitch move key) key KEY_KEY_P
216216

217217
# Key for toggling fast mode.
218218
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3

Diff for: ‎minetest.conf.example

+22-23
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
# Key for toggling pitch move mode.
205205
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
206206
# type: key
207-
# keymap_pitchmove = KEY_KEY_L
207+
# keymap_pitchmove = KEY_KEY_P
208208

209209
# Key for toggling fast mode.
210210
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
@@ -1291,7 +1291,7 @@
12911291
# ask_reconnect_on_crash = false
12921292

12931293
# From how far clients know about objects, stated in mapblocks (16 nodes).
1294-
#
1294+
#
12951295
# Setting this larger than active_block_range will also cause the server
12961296
# to maintain active objects up to this distance in the direction the
12971297
# player is looking. (This can avoid mobs suddenly disappearing from view)
@@ -1804,7 +1804,7 @@
18041804
# octaves = 3,
18051805
# persistence = 0.5,
18061806
# lacunarity = 2.0,
1807-
# flags =
1807+
# flags =
18081808
# }
18091809

18101810
# Second of two 3D noises that together define tunnels.
@@ -1817,7 +1817,7 @@
18171817
# octaves = 3,
18181818
# persistence = 0.5,
18191819
# lacunarity = 2.0,
1820-
# flags =
1820+
# flags =
18211821
# }
18221822

18231823
# 3D noise defining giant caverns.
@@ -1830,7 +1830,7 @@
18301830
# octaves = 5,
18311831
# persistence = 0.63,
18321832
# lacunarity = 2.0,
1833-
# flags =
1833+
# flags =
18341834
# }
18351835

18361836
# 3D noise defining terrain.
@@ -2213,7 +2213,7 @@
22132213
# octaves = 5,
22142214
# persistence = 0.63,
22152215
# lacunarity = 2.0,
2216-
# flags =
2216+
# flags =
22172217
# }
22182218

22192219
# 3D noise defining structure of river canyon walls.
@@ -2226,7 +2226,7 @@
22262226
# octaves = 4,
22272227
# persistence = 0.75,
22282228
# lacunarity = 2.0,
2229-
# flags =
2229+
# flags =
22302230
# }
22312231

22322232
# 3D noise defining giant caverns.
@@ -2239,7 +2239,7 @@
22392239
# octaves = 5,
22402240
# persistence = 0.63,
22412241
# lacunarity = 2.0,
2242-
# flags =
2242+
# flags =
22432243
# }
22442244

22452245
# First of two 3D noises that together define tunnels.
@@ -2252,7 +2252,7 @@
22522252
# octaves = 3,
22532253
# persistence = 0.5,
22542254
# lacunarity = 2.0,
2255-
# flags =
2255+
# flags =
22562256
# }
22572257

22582258
# Second of two 3D noises that together define tunnels.
@@ -2265,7 +2265,7 @@
22652265
# octaves = 3,
22662266
# persistence = 0.5,
22672267
# lacunarity = 2.0,
2268-
# flags =
2268+
# flags =
22692269
# }
22702270

22712271
## Mapgen Carpathian
@@ -2465,7 +2465,7 @@
24652465
# octaves = 5,
24662466
# persistence = 0.55,
24672467
# lacunarity = 2.0,
2468-
# flags =
2468+
# flags =
24692469
# }
24702470

24712471
# First of two 3D noises that together define tunnels.
@@ -2478,7 +2478,7 @@
24782478
# octaves = 3,
24792479
# persistence = 0.5,
24802480
# lacunarity = 2.0,
2481-
# flags =
2481+
# flags =
24822482
# }
24832483

24842484
# Second of two 3D noises that together define tunnels.
@@ -2491,7 +2491,7 @@
24912491
# octaves = 3,
24922492
# persistence = 0.5,
24932493
# lacunarity = 2.0,
2494-
# flags =
2494+
# flags =
24952495
# }
24962496

24972497
# 3D noise defining giant caverns.
@@ -2504,7 +2504,7 @@
25042504
# octaves = 5,
25052505
# persistence = 0.63,
25062506
# lacunarity = 2.0,
2507-
# flags =
2507+
# flags =
25082508
# }
25092509

25102510
## Mapgen Flat
@@ -2596,7 +2596,7 @@
25962596
# octaves = 3,
25972597
# persistence = 0.5,
25982598
# lacunarity = 2.0,
2599-
# flags =
2599+
# flags =
26002600
# }
26012601

26022602
# Second of two 3D noises that together define tunnels.
@@ -2609,7 +2609,7 @@
26092609
# octaves = 3,
26102610
# persistence = 0.5,
26112611
# lacunarity = 2.0,
2612-
# flags =
2612+
# flags =
26132613
# }
26142614

26152615
## Mapgen Fractal
@@ -2759,7 +2759,7 @@
27592759
# octaves = 3,
27602760
# persistence = 0.5,
27612761
# lacunarity = 2.0,
2762-
# flags =
2762+
# flags =
27632763
# }
27642764

27652765
# Second of two 3D noises that together define tunnels.
@@ -2772,7 +2772,7 @@
27722772
# octaves = 3,
27732773
# persistence = 0.5,
27742774
# lacunarity = 2.0,
2775-
# flags =
2775+
# flags =
27762776
# }
27772777

27782778
## Mapgen Valleys
@@ -2844,7 +2844,7 @@
28442844
# octaves = 3,
28452845
# persistence = 0.5,
28462846
# lacunarity = 2.0,
2847-
# flags =
2847+
# flags =
28482848
# }
28492849

28502850
# Second of two 3D noises that together define tunnels.
@@ -2857,7 +2857,7 @@
28572857
# octaves = 3,
28582858
# persistence = 0.5,
28592859
# lacunarity = 2.0,
2860-
# flags =
2860+
# flags =
28612861
# }
28622862

28632863
# The depth of dirt or other biome filler node.
@@ -2883,7 +2883,7 @@
28832883
# octaves = 6,
28842884
# persistence = 0.63,
28852885
# lacunarity = 2.0,
2886-
# flags =
2886+
# flags =
28872887
# }
28882888

28892889
# Defines large-scale river channel structure.
@@ -2935,7 +2935,7 @@
29352935
# octaves = 6,
29362936
# persistence = 0.8,
29372937
# lacunarity = 2.0,
2938-
# flags =
2938+
# flags =
29392939
# }
29402940

29412941
# Amplifies the valleys.
@@ -3025,4 +3025,3 @@
30253025
# so see a full list at https://content.minetest.net/help/content_flags/
30263026
# type: string
30273027
# contentdb_flag_blacklist = nonfree, desktop_default
3028-

Diff for: ‎src/defaultsettings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void set_default_settings(Settings *settings)
8282
settings->setDefault("keymap_console", "KEY_F10");
8383
settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
8484
settings->setDefault("keymap_freemove", "KEY_KEY_K");
85-
settings->setDefault("keymap_pitchmove", "KEY_KEY_L");
85+
settings->setDefault("keymap_pitchmove", "KEY_KEY_P");
8686
settings->setDefault("keymap_fastmove", "KEY_KEY_J");
8787
settings->setDefault("keymap_noclip", "KEY_KEY_H");
8888
settings->setDefault("keymap_hotbar_next", "KEY_KEY_N");

Diff for: ‎src/gui/guiKeyChangeMenu.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ enum
5050
GUI_ID_KEY_FAST_BUTTON,
5151
GUI_ID_KEY_JUMP_BUTTON,
5252
GUI_ID_KEY_NOCLIP_BUTTON,
53-
GUI_ID_KEY_CINEMATIC_BUTTON,
53+
GUI_ID_KEY_PITCH_MOVE,
5454
GUI_ID_KEY_CHAT_BUTTON,
5555
GUI_ID_KEY_CMD_BUTTON,
5656
GUI_ID_KEY_CMD_LOCAL_BUTTON,
@@ -119,9 +119,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
119119

120120
const float s = m_gui_scale;
121121
DesiredRect = core::rect<s32>(
122-
screensize.X / 2 - 745 * s / 2,
122+
screensize.X / 2 - 835 * s / 2,
123123
screensize.Y / 2 - 430 * s / 2,
124-
screensize.X / 2 + 745 * s / 2,
124+
screensize.X / 2 + 835 * s / 2,
125125
screensize.Y / 2 + 430 * s / 2
126126
);
127127
recalculateAbsolutePosition(false);
@@ -155,13 +155,13 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
155155

156156
{
157157
core::rect<s32> rect(0, 0, 100 * s, 30 * s);
158-
rect += topleft + v2s32(offset.X + 120 * s, offset.Y - 5 * s);
158+
rect += topleft + v2s32(offset.X + 150 * s, offset.Y - 5 * s);
159159
const wchar_t *text = wgettext(k->key.name());
160160
k->button = Environment->addButton(rect, this, k->id, text);
161161
delete[] text;
162162
}
163163
if ((i + 1) % KMaxButtonPerColumns == 0) {
164-
offset.X += 230 * s;
164+
offset.X += 260 * s;
165165
offset.Y = 60 * s;
166166
} else {
167167
offset += v2s32(0, 25 * s);
@@ -430,9 +430,9 @@ void GUIKeyChangeMenu::init_keys()
430430
this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"), "keymap_hotbar_next");
431431
this->add_key(GUI_ID_KEY_ZOOM_BUTTON, wgettext("Zoom"), "keymap_zoom");
432432
this->add_key(GUI_ID_KEY_CAMERA_BUTTON, wgettext("Change camera"), "keymap_camera_mode");
433-
this->add_key(GUI_ID_KEY_CINEMATIC_BUTTON, wgettext("Toggle Cinematic"), "keymap_cinematic");
434433
this->add_key(GUI_ID_KEY_MINIMAP_BUTTON, wgettext("Toggle minimap"), "keymap_minimap");
435434
this->add_key(GUI_ID_KEY_FLY_BUTTON, wgettext("Toggle fly"), "keymap_freemove");
435+
this->add_key(GUI_ID_KEY_PITCH_MOVE, wgettext("Toggle pitchmove"), "keymap_pitchmove");
436436
this->add_key(GUI_ID_KEY_FAST_BUTTON, wgettext("Toggle fast"), "keymap_fastmove");
437437
this->add_key(GUI_ID_KEY_NOCLIP_BUTTON, wgettext("Toggle noclip"), "keymap_noclip");
438438
this->add_key(GUI_ID_KEY_MUTE_BUTTON, wgettext("Mute"), "keymap_mute");
@@ -451,4 +451,3 @@ void GUIKeyChangeMenu::init_keys()
451451
this->add_key(GUI_ID_KEY_CHATLOG_BUTTON, wgettext("Toggle chat log"), "keymap_toggle_chat");
452452
this->add_key(GUI_ID_KEY_FOG_BUTTON, wgettext("Toggle fog"), "keymap_toggle_fog");
453453
}
454-

0 commit comments

Comments
 (0)
Please sign in to comment.