Skip to content

Commit 3f5ba41

Browse files
committed
Add default settings for SDL
1 parent ecb126b commit 3f5ba41

File tree

1 file changed

+43
-5
lines changed

1 file changed

+43
-5
lines changed

src/defaultsettings.cpp

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ void set_default_settings()
103103

104104
// Client
105105
settings->setDefault("address", "");
106+
settings->setDefault("remote_port", "30000");
106107
settings->setDefault("enable_sound", "true");
107108
settings->setDefault("enable_touch", bool_to_cstr(has_touch));
108109
settings->setDefault("sound_volume", "0.8");
@@ -136,7 +137,43 @@ void set_default_settings()
136137
settings->setDefault("chat_weblink_color", "#8888FF");
137138

138139
// Keymap
139-
settings->setDefault("remote_port", "30000");
140+
#if USE_SDL2
141+
settings->setDefault("save_keys_as_scancodes", "true");
142+
settings->setDefault("keymap_forward", "<26>");
143+
settings->setDefault("keymap_autoforward", "");
144+
settings->setDefault("keymap_backward", "<22>");
145+
settings->setDefault("keymap_left", "<4>");
146+
settings->setDefault("keymap_right", "<7>");
147+
settings->setDefault("keymap_jump", "<44>");
148+
settings->setDefault("keymap_sneak", "KEY_LSHIFT");
149+
settings->setDefault("keymap_dig", "KEY_LBUTTON");
150+
settings->setDefault("keymap_place", "KEY_RBUTTON");
151+
settings->setDefault("keymap_drop", "<20>");
152+
settings->setDefault("keymap_zoom", "<29>");
153+
settings->setDefault("keymap_inventory", "<12>");
154+
settings->setDefault("keymap_aux1", "<8>");
155+
settings->setDefault("keymap_chat", "<23>");
156+
settings->setDefault("keymap_cmd", "<56>");
157+
settings->setDefault("keymap_cmd_local", "<55>");
158+
settings->setDefault("keymap_minimap", "<25>");
159+
settings->setDefault("keymap_console", "KEY_F10");
160+
161+
// See https://github.com/minetest/minetest/issues/12792
162+
settings->setDefault("keymap_rangeselect", has_touch ? "<21>" : "");
163+
164+
settings->setDefault("keymap_freemove", "<14>");
165+
settings->setDefault("keymap_pitchmove", "");
166+
settings->setDefault("keymap_fastmove", "<13>");
167+
settings->setDefault("keymap_noclip", "<11>");
168+
settings->setDefault("keymap_hotbar_next", "<17>");
169+
settings->setDefault("keymap_hotbar_previous", "<5>");
170+
settings->setDefault("keymap_mute", "<16>");
171+
settings->setDefault("keymap_camera_mode", "<6>");
172+
settings->setDefault("keymap_increase_viewing_range_min", "<46>");
173+
settings->setDefault("keymap_decrease_viewing_range_min", "<45>");
174+
#else
175+
// TODO: Remove this once we fully switch to SDL2
176+
settings->setDefault("save_keys_as_scancodes", "false");
140177
settings->setDefault("keymap_forward", "KEY_KEY_W");
141178
settings->setDefault("keymap_autoforward", "");
142179
settings->setDefault("keymap_backward", "KEY_KEY_S");
@@ -166,6 +203,11 @@ void set_default_settings()
166203
settings->setDefault("keymap_hotbar_next", "KEY_KEY_N");
167204
settings->setDefault("keymap_hotbar_previous", "KEY_KEY_B");
168205
settings->setDefault("keymap_mute", "KEY_KEY_M");
206+
settings->setDefault("keymap_camera_mode", "KEY_KEY_C");
207+
settings->setDefault("keymap_increase_viewing_range_min", "+");
208+
settings->setDefault("keymap_decrease_viewing_range_min", "-");
209+
#endif
210+
169211
settings->setDefault("keymap_increase_volume", "");
170212
settings->setDefault("keymap_decrease_volume", "");
171213
settings->setDefault("keymap_cinematic", "");
@@ -180,11 +222,8 @@ void set_default_settings()
180222
#endif
181223
settings->setDefault("keymap_toggle_debug", "KEY_F5");
182224
settings->setDefault("keymap_toggle_profiler", "KEY_F6");
183-
settings->setDefault("keymap_camera_mode", "KEY_KEY_C");
184225
settings->setDefault("keymap_screenshot", "KEY_F12");
185226
settings->setDefault("keymap_fullscreen", "KEY_F11");
186-
settings->setDefault("keymap_increase_viewing_range_min", "+");
187-
settings->setDefault("keymap_decrease_viewing_range_min", "-");
188227
settings->setDefault("keymap_slot1", "KEY_KEY_1");
189228
settings->setDefault("keymap_slot2", "KEY_KEY_2");
190229
settings->setDefault("keymap_slot3", "KEY_KEY_3");
@@ -363,7 +402,6 @@ void set_default_settings()
363402
settings->setDefault("repeat_dig_time", "0.0");
364403
settings->setDefault("safe_dig_and_place", "false");
365404
settings->setDefault("random_input", "false");
366-
settings->setDefault("save_keys_as_scancodes", "false");
367405
settings->setDefault("aux1_descends", "false");
368406
settings->setDefault("doubletap_jump", "false");
369407
settings->setDefault("always_fly_fast", "true");

0 commit comments

Comments
 (0)