From 8b6cce18cb90014e4e8e4c491b0c06def4982c13 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 11 Mar 2012 12:06:59 +0200 Subject: Improve command-line parameters --- doc/minetest.6 | 31 +++++++++++++++++++++++-------- doc/minetestserver.6 | 18 ++++++++++++------ 2 files changed, 35 insertions(+), 14 deletions(-) (limited to 'doc') diff --git a/doc/minetest.6 b/doc/minetest.6 index ef425a6df..fe260da08 100644 --- a/doc/minetest.6 +++ b/doc/minetest.6 @@ -1,5 +1,5 @@ .\" Minetest man page -.TH minetest 6 "29 January 2012" "" "" +.TH minetest 6 "11 March 2012" "" "" .SH NAME minetest \- Multiplayer infinite-world block sandbox @@ -28,26 +28,41 @@ Disable unit tests \-\-enable\-unittests Enable unit tests .TP +\-\-go +Disable main menu +.TP \-\-help Show allowed options .TP -\-\-info\-on\-stderr -Print debug information to console +\-\-logfile +Set logfile path (debug.txt) .TP \-\-map\-dir -Map directory (where everything in the world is stored) +Same as --world (deprecated) +.TP +\-\-name +Set player name +.TP +\-\-password +Set password .TP \-\-port -Set network port to connect to +Set network port (UDP) to use .TP \-\-random\-input Enable random user input, for testing .TP \-\-server -Run server directly +Run dedicated server .TP \-\-speedtests Run speed tests +.TP +\-\-verbose +Print more information to console +.TP +\-\-world +Set world path .SH BUGS Please report all bugs to Perttu Ahola . @@ -57,11 +72,11 @@ Please report all bugs to Perttu Ahola . Perttu Ahola and contributors. .PP -This man page was written by +This man page was originally written by Juhani Numminen . .SH WWW http://c55.me/minetest/ .SH "SEE ALSO" -.BR minetestserver(6) \ No newline at end of file +.BR minetestserver(6) diff --git a/doc/minetestserver.6 b/doc/minetestserver.6 index 9540e2c42..0db7e3863 100644 --- a/doc/minetestserver.6 +++ b/doc/minetestserver.6 @@ -1,5 +1,5 @@ .\" Minetestserver man page -.TH minetestserver 6 "29 January 2012" "" "" +.TH minetestserver 6 "11 March 2012" "" "" .SH NAME minetestserver \- Minetest server @@ -28,14 +28,20 @@ Enable unit tests \-\-help Show allowed options .TP -\-\-info\-on\-stderr -Print debug information to console +\-\-logfile +Set logfile path (debug.txt) .TP \-\-map\-dir -Map directory (where everything in the world is stored) +Same as --world (deprecated) .TP \-\-port Set network port (UDP) to use +.TP +\-\-verbose +Print more information to console +.TP +\-\-world +Set world path .SH BUGS Please report all bugs to Perttu Ahola . @@ -45,11 +51,11 @@ Please report all bugs to Perttu Ahola . Perttu Ahola and contributors. .PP -This man page was written by +This man page was originally written by Juhani Numminen . .SH WWW http://c55.me/minetest/ .SH "SEE ALSO" -.BR minetest(6) \ No newline at end of file +.BR minetest(6) -- cgit v1.2.3 a> 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 
/*
Minetest
Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2017 nerzhul, Loic Blot <loic.blot@unix-experience.fr>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#include "util/numeric.h"
#include "inputhandler.h"
#include "gui/mainmenumanager.h"
#include "hud.h"

void KeyCache::populate_nonchanging()
{
	key[KeyType::ESC] = EscapeKey;
}

void KeyCache::populate()
{
	key[KeyType::FORWARD] = getKeySetting("keymap_forward");
	key[KeyType::BACKWARD] = getKeySetting("keymap_backward");
	key[KeyType::LEFT] = getKeySetting("keymap_left");
	key[KeyType::RIGHT] = getKeySetting("keymap_right");
	key[KeyType::JUMP] = getKeySetting("keymap_jump");
	key[KeyType::SPECIAL1] = getKeySetting("keymap_special1");
	key[KeyType::SNEAK] = getKeySetting("keymap_sneak");

	key[KeyType::AUTOFORWARD] = getKeySetting("keymap_autoforward");

	key[KeyType::DROP] = getKeySetting("keymap_drop");
	key[KeyType::INVENTORY] = getKeySetting("keymap_inventory");
	key[KeyType::CHAT] = getKeySetting("keymap_chat");
	key[KeyType::CMD] = getKeySetting("keymap_cmd");
	key[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local");
	key[KeyType::CONSOLE] = getKeySetting("keymap_console");
	key[KeyType::MINIMAP] = getKeySetting("keymap_minimap");
	key[KeyType::FREEMOVE] = getKeySetting("keymap_freemove");
	key[KeyType::PITCHMOVE] = getKeySetting("keymap_pitchmove");
	key[KeyType::FASTMOVE] = getKeySetting("keymap_fastmove");
	key[KeyType::NOCLIP] = getKeySetting("keymap_noclip");
	key[KeyType::HOTBAR_PREV] = getKeySetting("keymap_hotbar_previous");
	key[KeyType::HOTBAR_NEXT] = getKeySetting("keymap_hotbar_next");
	key[KeyType::MUTE] = getKeySetting("keymap_mute");
	key[KeyType::INC_VOLUME] = getKeySetting("keymap_increase_volume");
	key[KeyType::DEC_VOLUME] = getKeySetting("keymap_decrease_volume");
	key[KeyType::CINEMATIC] = getKeySetting("keymap_cinematic");
	key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
	key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
	key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
	key[KeyType::TOGGLE_FOG] = getKeySetting("keymap_toggle_fog");
	key[KeyType::TOGGLE_UPDATE_CAMERA] = getKeySetting("keymap_toggle_update_camera");
	key[KeyType::TOGGLE_DEBUG] = getKeySetting("keymap_toggle_debug");
	key[KeyType::TOGGLE_PROFILER] = getKeySetting("keymap_toggle_profiler");
	key[KeyType::CAMERA_MODE] = getKeySetting("keymap_camera_mode");
	key[KeyType::INCREASE_VIEWING_RANGE] =
			getKeySetting("keymap_increase_viewing_range_min");
	key[KeyType::DECREASE_VIEWING_RANGE] =
			getKeySetting("keymap_decrease_viewing_range_min");
	key[KeyType::RANGESELECT] = getKeySetting("keymap_rangeselect");
	key[KeyType::ZOOM] = getKeySetting("keymap_zoom");

	key[KeyType::QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
	key[KeyType::QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
	key[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc");
	key[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec");

	for (int i = 0; i < HUD_HOTBAR_ITEMCOUNT_MAX; i++) {