From f2d3cf6088b5ec9147556248277e20033e1e595e Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 27 May 2017 13:15:43 +0200 Subject: [PATCH] Remove outdated g_waypointsprite_tactical cvar; fix typos in some cvar descriptions and comments --- defaultXonotic.cfg | 13 ++++++------- qcsrc/common/t_items.qc | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 33ec16e4e..2b431e8fe 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -321,7 +321,7 @@ seta sv_spectate 1 "if set to 1, new clients are allowed to spectate or observe seta sv_defaultcharacter 0 "master switch, if set to 1 the further configuration for replacing all player models, skins and colors is taken from the sv_defaultplayermodel, sv_defaultplayerskin and sv_defaultplayercolors variables" seta sv_defaultcharacterskin 0 "if set to 1 the further configuration for replacing all skins is taken from the sv_defaultplayerskin variables" seta sv_defaultplayermodel "models/player/erebus.iqm" "default model selection, only works if sv_defaultcharacter is set to 1; you may append a : suffix to model names; you can specify multiple, separated by space, and a random one will be chosen" -seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1; can be overriden by : suffix in sv_defaultplayermodel" +seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1; can be overridden by : suffix in sv_defaultplayermodel" seta sv_defaultplayermodel_red "" "\"\" means see sv_defaultplayermodel" seta sv_defaultplayerskin_red 0 seta sv_defaultplayermodel_blue "" "\"\" means see sv_defaultplayermodel" @@ -788,12 +788,11 @@ alias "g_waypointsprite_team_danger_d" "impulse 39" alias "g_waypointsprite_clear_personal" "impulse 47" alias "g_waypointsprite_clear" "impulse 48" alias "g_waypointsprite_toggle" "toggle cl_hidewaypoints" -// key for that? + seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints" seta g_waypointsprite_turrets 1 "disable turret waypoints" -seta g_waypointsprite_turrets_maxdist 5000 "max distace for turret sprites" -seta g_waypointsprite_tactical 1 "tactical overlay on turrets when in a vehicle" +seta g_waypointsprite_turrets_maxdist 5000 "max distance for turret waypoints" seta cl_damagetext "1" "Draw damage dealt where you hit the enemy" seta cl_damagetext_format "-{total}" "How to format the damage text. {health}, {armor}, {total}, {potential}: full damage not capped to target's health, {potential_health}: health damage not capped to target's health" @@ -1152,7 +1151,7 @@ seta sv_gentle 0 "force gentle mode for everyone, also remove references to act seta cl_gentle 0 "client side gentle mode, master switch for removing both gibs and messages" seta cl_gentle_gibs 0 "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs" seta cl_gentle_messages 0 "client side gentle mode (only replaces frag messages/centerprints)" -seta cl_gentle_damage 0 "client side gentle mode (only replaces damage flash); when set to 1, a white flash replaces the blood image, when set to 2, a randomily colored flash is used instead" +seta cl_gentle_damage 0 "client side gentle mode (only replaces damage flash); when set to 1, a white flash replaces the blood image, when set to 2, a randomly colored flash is used instead" set g_jetpack 0 "Jetpack mutator" @@ -1236,7 +1235,7 @@ seta cl_forceplayercolors 0 "make enemies look like your own color (requires ser seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)" seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)" seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)" -seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce preceived lag" +seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce perceived lag" seta cl_movement_intermissionrunning 0 "keep velocity after the match ends, players may appear to continue running while stationary" // campaign internal, set when loading a campaign map1G @@ -1498,7 +1497,7 @@ seta cl_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the c set sv_simple_items 1 "allow or forbid client use of simple items" seta cl_simple_items 0 "enable simple items (if server allows)" set cl_simpleitems_postfix "_luma" "posfix to add fo model name when simple items are enabled" -set cl_fullbright_items 0 "enable fullbright items (if server allows, controled by g_fullbrightitems)" +set cl_fullbright_items 0 "enable fullbright items (if server allows, controlled by g_fullbrightitems)" set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0" set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0" diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 3151d7cdb..2746eabfc 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -181,7 +181,7 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew) setsize(this, '-16 -16 0', (use_bigsize) ? '16 16 48' : '16 16 32'); } - if(sf & ISF_STATUS) // need to read/write status frist so model can handle simple, fb etc. + if(sf & ISF_STATUS) // need to read/write status first so model can handle simple, fb etc. { this.ItemStatus = ReadByte(); -- 2.39.2