Skip to content

Commit 8002366

Browse files
ShadowNinjaShadowNinja
committedJan 14, 2017
Organize defaultsettings.cpp
·
5.11.00.4.16
1 parent bb154c2 commit 8002366

File tree

1 file changed

+107
-112
lines changed

1 file changed

+107
-112
lines changed
 

‎src/defaultsettings.cpp

+107-112
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,39 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2323
#include "config.h"
2424
#include "constants.h"
2525
#include "porting.h"
26+
#include "util/string.h"
2627

2728
void set_default_settings(Settings *settings)
2829
{
2930
// Client and server
30-
31+
settings->setDefault("language", "");
3132
settings->setDefault("name", "");
33+
settings->setDefault("bind_address", "");
34+
settings->setDefault("serverlist_url", "servers.minetest.net");
3235

33-
// Client stuff
36+
// Client
37+
settings->setDefault("address", "");
38+
settings->setDefault("enable_sound", "true");
39+
settings->setDefault("sound_volume", "0.8");
40+
settings->setDefault("enable_mesh_cache", "false");
41+
settings->setDefault("enable_vbo", "true");
42+
settings->setDefault("free_move", "false");
43+
settings->setDefault("fast_move", "false");
44+
settings->setDefault("noclip", "false");
45+
settings->setDefault("screenshot_path", ".");
46+
settings->setDefault("screenshot_format", "png");
47+
settings->setDefault("screenshot_quality", "0");
48+
settings->setDefault("client_unload_unused_data_timeout", "600");
49+
settings->setDefault("client_mapblock_limit", "5000");
50+
settings->setDefault("enable_build_where_you_stand", "false" );
51+
settings->setDefault("send_pre_v25_init", "false");
52+
settings->setDefault("curl_timeout", "5000");
53+
settings->setDefault("curl_parallel_limit", "8");
54+
settings->setDefault("curl_file_download_timeout", "300000");
55+
settings->setDefault("curl_verify_cert", "true");
56+
settings->setDefault("enable_remote_media_server", "true");
57+
58+
// Keymap
3459
settings->setDefault("remote_port", "30000");
3560
settings->setDefault("keymap_forward", "KEY_KEY_W");
3661
settings->setDefault("keymap_autorun", "");
@@ -52,85 +77,60 @@ void set_default_settings(Settings *settings)
5277
settings->setDefault("keymap_fastmove", "KEY_KEY_J");
5378
settings->setDefault("keymap_noclip", "KEY_KEY_H");
5479
settings->setDefault("keymap_cinematic", "");
55-
settings->setDefault("keymap_screenshot", "KEY_F12");
5680
settings->setDefault("keymap_toggle_hud", "KEY_F1");
5781
settings->setDefault("keymap_toggle_chat", "KEY_F2");
5882
settings->setDefault("keymap_toggle_force_fog_off", "KEY_F3");
59-
settings->setDefault("keymap_toggle_update_camera",
6083
#if DEBUG
61-
"KEY_F4");
84+
settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
6285
#else
63-
"");
86+
settings->setDefault("keymap_toggle_update_camera", "");
6487
#endif
6588
settings->setDefault("keymap_toggle_debug", "KEY_F5");
6689
settings->setDefault("keymap_toggle_profiler", "KEY_F6");
6790
settings->setDefault("keymap_camera_mode", "KEY_F7");
91+
settings->setDefault("keymap_screenshot", "KEY_F12");
6892
settings->setDefault("keymap_increase_viewing_range_min", "+");
6993
settings->setDefault("keymap_decrease_viewing_range_min", "-");
70-
settings->setDefault("enable_build_where_you_stand", "false" );
71-
settings->setDefault("3d_mode", "none");
72-
settings->setDefault("3d_paralax_strength", "0.025");
73-
settings->setDefault("aux1_descends", "false");
74-
settings->setDefault("doubletap_jump", "false");
75-
settings->setDefault("always_fly_fast", "true");
76-
settings->setDefault("directional_colored_fog", "true");
77-
settings->setDefault("tooltip_show_delay", "400");
78-
settings->setDefault("zoom_fov", "15");
79-
8094
// Some (temporary) keys for debugging
8195
settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
8296
settings->setDefault("keymap_quicktune_prev", "KEY_HOME");
8397
settings->setDefault("keymap_quicktune_next", "KEY_END");
8498
settings->setDefault("keymap_quicktune_dec", "KEY_NEXT");
8599
settings->setDefault("keymap_quicktune_inc", "KEY_PRIOR");
86100

87-
// Show debug info by default?
88-
#ifdef NDEBUG
101+
// Visuals
102+
#ifdef NDEBUG
89103
settings->setDefault("show_debug", "false");
90-
#else
104+
#else
91105
settings->setDefault("show_debug", "true");
92-
#endif
93-
106+
#endif
107+
settings->setDefault("fsaa", "0");
108+
settings->setDefault("enable_fog", "true");
109+
settings->setDefault("fog_start", "0.4");
110+
settings->setDefault("3d_mode", "none");
111+
settings->setDefault("3d_paralax_strength", "0.025");
112+
settings->setDefault("tooltip_show_delay", "400");
113+
settings->setDefault("zoom_fov", "15");
94114
settings->setDefault("fps_max", "60");
95115
settings->setDefault("pause_fps_max", "20");
96116
settings->setDefault("viewing_range", "100");
97-
settings->setDefault("map_generation_limit", "31000");
98117
settings->setDefault("screenW", "800");
99118
settings->setDefault("screenH", "600");
100119
settings->setDefault("fullscreen", "false");
101120
settings->setDefault("fullscreen_bpp", "24");
102-
settings->setDefault("fsaa", "0");
103121
settings->setDefault("vsync", "false");
104-
settings->setDefault("address", "");
105-
settings->setDefault("random_input", "false");
106-
settings->setDefault("client_unload_unused_data_timeout", "600");
107-
settings->setDefault("client_mapblock_limit", "5000");
108-
settings->setDefault("enable_fog", "true");
109-
settings->setDefault("fog_start", "0.4");
110122
settings->setDefault("fov", "72");
111-
settings->setDefault("view_bobbing", "true");
112123
settings->setDefault("leaves_style", "fancy");
113124
settings->setDefault("connected_glass", "false");
114125
settings->setDefault("smooth_lighting", "true");
115126
settings->setDefault("display_gamma", "2.2");
116127
settings->setDefault("texture_path", "");
117128
settings->setDefault("shader_path", "");
118129
settings->setDefault("video_driver", "opengl");
119-
settings->setDefault("free_move", "false");
120-
settings->setDefault("noclip", "false");
121-
settings->setDefault("continuous_forward", "false");
122-
settings->setDefault("enable_joysticks", "false");
123-
settings->setDefault("repeat_joystick_button_time", "0.17");
124-
settings->setDefault("joystick_frustum_sensitivity", "170");
125130
settings->setDefault("cinematic", "false");
126131
settings->setDefault("camera_smoothing", "0");
127132
settings->setDefault("cinematic_camera_smoothing", "0.7");
128-
settings->setDefault("fast_move", "false");
129-
settings->setDefault("invert_mouse", "false");
130133
settings->setDefault("enable_clouds", "true");
131-
settings->setDefault("screenshot_path", ".");
132-
settings->setDefault("screenshot_format", "png");
133-
settings->setDefault("screenshot_quality", "0");
134134
settings->setDefault("view_bobbing_amount", "1.0");
135135
settings->setDefault("fall_bobbing_amount", "0.0");
136136
settings->setDefault("enable_3d_clouds", "true");
@@ -142,28 +142,35 @@ void set_default_settings(Settings *settings)
142142
settings->setDefault("console_alpha", "200");
143143
settings->setDefault("selectionbox_color", "(0,0,0)");
144144
settings->setDefault("selectionbox_width", "2");
145-
settings->setDefault("inventory_items_animations", "false");
146145
settings->setDefault("node_highlighting", "box");
147146
settings->setDefault("crosshair_color", "(255,255,255)");
148147
settings->setDefault("crosshair_alpha", "255");
149148
settings->setDefault("hud_scaling", "1.0");
150149
settings->setDefault("gui_scaling", "1.0");
151150
settings->setDefault("gui_scaling_filter", "false");
152151
settings->setDefault("gui_scaling_filter_txr2img", "true");
153-
settings->setDefault("mouse_sensitivity", "0.2");
154-
settings->setDefault("enable_sound", "true");
155-
settings->setDefault("sound_volume", "0.8");
156152
settings->setDefault("desynchronize_mapblock_texture_animation", "true");
157153
settings->setDefault("hud_hotbar_max_width", "1.0");
158154
settings->setDefault("enable_local_map_saving", "false");
159155
settings->setDefault("show_entity_selectionbox", "true");
156+
settings->setDefault("texture_clean_transparent", "false");
157+
settings->setDefault("texture_min_size", "64");
158+
settings->setDefault("ambient_occlusion_gamma", "2.2");
159+
settings->setDefault("enable_shaders", "true");
160+
settings->setDefault("enable_particles", "true");
161+
162+
settings->setDefault("enable_minimap", "true");
163+
settings->setDefault("minimap_shape_round", "true");
164+
settings->setDefault("minimap_double_scan_height", "true");
160165

166+
// Effects
167+
settings->setDefault("directional_colored_fog", "true");
168+
settings->setDefault("view_bobbing", "true");
169+
settings->setDefault("inventory_items_animations", "false");
161170
settings->setDefault("mip_map", "false");
162171
settings->setDefault("anisotropic_filter", "false");
163172
settings->setDefault("bilinear_filter", "false");
164173
settings->setDefault("trilinear_filter", "false");
165-
settings->setDefault("texture_clean_transparent", "false");
166-
settings->setDefault("texture_min_size", "64");
167174
settings->setDefault("tone_mapping", "false");
168175
settings->setDefault("enable_bumpmapping", "false");
169176
settings->setDefault("enable_parallax_occlusion", "false");
@@ -180,35 +187,29 @@ void set_default_settings(Settings *settings)
180187
settings->setDefault("water_wave_speed", "5.0");
181188
settings->setDefault("enable_waving_leaves", "false");
182189
settings->setDefault("enable_waving_plants", "false");
183-
settings->setDefault("ambient_occlusion_gamma", "2.2");
184-
settings->setDefault("enable_shaders", "true");
185-
settings->setDefault("repeat_rightclick_time", "0.25");
186-
settings->setDefault("enable_particles", "true");
187-
settings->setDefault("enable_mesh_cache", "false");
188-
settings->setDefault("enable_vbo", "true");
189-
190-
settings->setDefault("enable_minimap", "true");
191-
settings->setDefault("minimap_shape_round", "true");
192-
settings->setDefault("minimap_double_scan_height", "true");
193190

194-
settings->setDefault("send_pre_v25_init", "false");
195-
196-
settings->setDefault("curl_timeout", "5000");
197-
settings->setDefault("curl_parallel_limit", "8");
198-
settings->setDefault("curl_file_download_timeout", "300000");
199-
settings->setDefault("curl_verify_cert", "true");
200191

201-
settings->setDefault("enable_remote_media_server", "true");
192+
// Input
193+
settings->setDefault("invert_mouse", "false");
194+
settings->setDefault("mouse_sensitivity", "0.2");
195+
settings->setDefault("repeat_rightclick_time", "0.25");
196+
settings->setDefault("random_input", "false");
197+
settings->setDefault("aux1_descends", "false");
198+
settings->setDefault("doubletap_jump", "false");
199+
settings->setDefault("always_fly_fast", "true");
200+
settings->setDefault("continuous_forward", "false");
201+
settings->setDefault("enable_joysticks", "false");
202+
settings->setDefault("repeat_joystick_button_time", "0.17");
203+
settings->setDefault("joystick_frustum_sensitivity", "170");
202204

203-
settings->setDefault("serverlist_url", "servers.minetest.net");
205+
// Main menu
206+
settings->setDefault("main_menu_path", "");
207+
settings->setDefault("main_menu_mod_mgr", "1");
208+
settings->setDefault("main_menu_game_mgr", "0");
209+
settings->setDefault("modstore_download_url", "https://forum.minetest.net/media/");
210+
settings->setDefault("modstore_listmods_url", "https://forum.minetest.net/mmdb/mods/");
211+
settings->setDefault("modstore_details_url", "https://forum.minetest.net/mmdb/mod/*/");
204212
settings->setDefault("serverlist_file", "favoriteservers.txt");
205-
settings->setDefault("server_announce", "false");
206-
settings->setDefault("server_url", "");
207-
settings->setDefault("server_address", "");
208-
settings->setDefault("server_name", "");
209-
settings->setDefault("server_description", "");
210-
211-
settings->setDefault("disable_escape_sequences", "false");
212213

213214
#if USE_FREETYPE
214215
settings->setDefault("freetype", "true");
@@ -221,41 +222,43 @@ void set_default_settings(Settings *settings)
221222
settings->setDefault("fallback_font_shadow", "1");
222223
settings->setDefault("fallback_font_shadow_alpha", "128");
223224

224-
std::stringstream fontsize;
225-
fontsize << TTF_DEFAULT_FONT_SIZE;
225+
std::string font_size_str = std::to_string(TTF_DEFAULT_FONT_SIZE);
226226

227-
settings->setDefault("font_size", fontsize.str());
228-
settings->setDefault("mono_font_size", fontsize.str());
229-
settings->setDefault("fallback_font_size", fontsize.str());
227+
settings->setDefault("fallback_font_size", font_size_str);
230228
#else
231229
settings->setDefault("freetype", "false");
232230
settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "lucida_sans"));
233231
settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
234232

235-
std::stringstream fontsize;
236-
fontsize << DEFAULT_FONT_SIZE;
237-
238-
settings->setDefault("font_size", fontsize.str());
239-
settings->setDefault("mono_font_size", fontsize.str());
233+
std::string font_size_str = to_string(DEFAULT_FONT_SIZE);
240234
#endif
235+
settings->setDefault("font_size", font_size_str);
236+
settings->setDefault("mono_font_size", font_size_str);
237+
238+
239+
// Server
240+
settings->setDefault("disable_escape_sequences", "false");
241241

242-
// Server stuff
243-
// "map-dir" doesn't exist by default.
242+
// Network
243+
settings->setDefault("enable_ipv6", "true");
244+
settings->setDefault("ipv6_server", "false");
244245
settings->setDefault("workaround_window_size","5");
245246
settings->setDefault("max_packets_per_iteration","1024");
246247
settings->setDefault("port", "30000");
247-
settings->setDefault("bind_address", "");
248+
settings->setDefault("strict_protocol_version_checking", "false");
249+
settings->setDefault("player_transfer_distance", "0");
250+
settings->setDefault("max_simultaneous_block_sends_per_client", "10");
251+
settings->setDefault("max_simultaneous_block_sends_server_total", "40");
252+
settings->setDefault("time_send_interval", "5");
253+
248254
settings->setDefault("default_game", "minetest");
249255
settings->setDefault("motd", "");
250256
settings->setDefault("max_users", "15");
251-
settings->setDefault("strict_protocol_version_checking", "false");
252257
settings->setDefault("creative_mode", "false");
253258
settings->setDefault("enable_damage", "true");
254-
settings->setDefault("fixed_map_seed", "");
255259
settings->setDefault("give_initial_stuff", "false");
256260
settings->setDefault("default_password", "");
257261
settings->setDefault("default_privs", "interact, shout");
258-
settings->setDefault("player_transfer_distance", "0");
259262
settings->setDefault("enable_pvp", "true");
260263
settings->setDefault("disallow_empty_password", "false");
261264
settings->setDefault("disable_anticheat", "false");
@@ -271,18 +274,13 @@ void set_default_settings(Settings *settings)
271274
settings->setDefault("ask_reconnect_on_crash", "false");
272275

273276
settings->setDefault("profiler_print_interval", "0");
274-
settings->setDefault("enable_mapgen_debug_info", "false");
275277
settings->setDefault("active_object_send_range_blocks", "3");
276278
settings->setDefault("active_block_range", "3");
277279
//settings->setDefault("max_simultaneous_block_sends_per_client", "1");
278280
// This causes frametime jitter on client side, or does it?
279-
settings->setDefault("max_simultaneous_block_sends_per_client", "10");
280-
settings->setDefault("max_simultaneous_block_sends_server_total", "40");
281281
settings->setDefault("max_block_send_distance", "9");
282-
settings->setDefault("max_block_generate_distance", "7");
283282
settings->setDefault("block_send_optimize_distance", "4");
284283
settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
285-
settings->setDefault("time_send_interval", "5");
286284
settings->setDefault("time_speed", "72");
287285
settings->setDefault("server_unload_unused_data_timeout", "29");
288286
settings->setDefault("max_objects_per_block", "64");
@@ -307,7 +305,7 @@ void set_default_settings(Settings *settings)
307305
settings->setDefault("secure.trusted_mods", "");
308306
settings->setDefault("secure.http_mods", "");
309307

310-
// physics stuff
308+
// Physics
311309
settings->setDefault("movement_acceleration_default", "3");
312310
settings->setDefault("movement_acceleration_air", "2");
313311
settings->setDefault("movement_acceleration_fast", "10");
@@ -321,32 +319,30 @@ void set_default_settings(Settings *settings)
321319
settings->setDefault("movement_liquid_sink", "10");
322320
settings->setDefault("movement_gravity", "9.81");
323321

324-
//liquid stuff
322+
// Liquids
325323
settings->setDefault("liquid_loop_max", "100000");
326324
settings->setDefault("liquid_queue_purge_time", "0");
327325
settings->setDefault("liquid_update", "1.0");
328326

329-
//mapgen stuff
327+
// Mapgen
330328
settings->setDefault("mg_name", "v7");
331329
settings->setDefault("water_level", "1");
332330
settings->setDefault("chunksize", "5");
333331
settings->setDefault("mg_flags", "dungeons");
332+
settings->setDefault("fixed_map_seed", "");
333+
settings->setDefault("map_generation_limit", "31000");
334+
settings->setDefault("max_block_generate_distance", "7");
335+
settings->setDefault("enable_mapgen_debug_info", "false");
334336

335-
// IPv6
336-
settings->setDefault("enable_ipv6", "true");
337-
settings->setDefault("ipv6_server", "false");
338-
339-
settings->setDefault("main_menu_path", "");
340-
settings->setDefault("main_menu_mod_mgr", "1");
341-
settings->setDefault("main_menu_game_mgr", "0");
342-
settings->setDefault("modstore_download_url", "https://forum.minetest.net/media/");
343-
settings->setDefault("modstore_listmods_url", "https://forum.minetest.net/mmdb/mods/");
344-
settings->setDefault("modstore_details_url", "https://forum.minetest.net/mmdb/mod/*/");
337+
// Server list announcing
338+
settings->setDefault("server_announce", "false");
339+
settings->setDefault("server_url", "");
340+
settings->setDefault("server_address", "");
341+
settings->setDefault("server_name", "");
342+
settings->setDefault("server_description", "");
345343

346344
settings->setDefault("high_precision_fpu", "true");
347345

348-
settings->setDefault("language", "");
349-
350346
#ifdef __ANDROID__
351347
settings->setDefault("screenW", "0");
352348
settings->setDefault("screenH", "0");
@@ -375,13 +371,12 @@ void set_default_settings(Settings *settings)
375371
settings->setDefault("viewing_range", "25");
376372
settings->setDefault("inventory_image_hack", "false");
377373

378-
//check for device with small screen
374+
// Check for a device with a small screen
379375
float x_inches = ((double) porting::getDisplaySize().X /
380376
(160 * porting::getDisplayDensity()));
381377
if (x_inches < 3.5) {
382378
settings->setDefault("hud_scaling", "0.6");
383-
}
384-
else if (x_inches < 4.5) {
379+
} else if (x_inches < 4.5) {
385380
settings->setDefault("hud_scaling", "0.7");
386381
}
387382
settings->setDefault("curl_verify_cert","false");
@@ -393,7 +388,7 @@ void set_default_settings(Settings *settings)
393388
void override_default_settings(Settings *settings, Settings *from)
394389
{
395390
std::vector<std::string> names = from->getNames();
396-
for(size_t i=0; i<names.size(); i++){
391+
for (size_t i = 0; i < names.size(); i++) {
397392
const std::string &name = names[i];
398393
settings->setDefault(name, from->get(name));
399394
}

0 commit comments

Comments
 (0)
Please sign in to comment.