r5649 - in trunk/data: . qcsrc/server

esteel at icculus.org esteel at icculus.org
Fri Jan 23 10:07:58 EST 2009


Author: esteel
Date: 2009-01-23 10:07:58 -0500 (Fri, 23 Jan 2009)
New Revision: 5649

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/constants.qh
Log:
ups, a few tabs in wrong places

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-01-23 14:40:08 UTC (rev 5648)
+++ trunk/data/defaultNexuiz.cfg	2009-01-23 15:07:58 UTC (rev 5649)
@@ -16,7 +16,7 @@
 seta g_configversion 0
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 913e35a06d0542e7ba625bfe0e0844c9
+set cvar_check_default a53e77007f17570086417cc970eacf6e
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -353,17 +353,17 @@
 set bot_ai_aimskill_order_filter_3th 0.05
 set bot_ai_aimskill_order_filter_4th 0.25
 set bot_ai_aimskill_order_filter_5th 0.3
-set bot_ai_custom_weapon_priority_distances "200	1000" "Define close and far distances in any order, the bots will detect middle distances automatically. "
-set bot_ai_custom_weapon_priority_far 	 "11 7 15 14 4 5 8 13 6 1 3 9 2" "Desired weapons in any order. Up to the max ammount of weapons available in the system "
-set bot_ai_custom_weapon_priority_mid 	 "11 9 4 5 3 7 15 14 6 13 8 2 1" "same as previous "
-set bot_ai_custom_weapon_priority_close "11	3 9 13 14 8 6 4 2 5 7 15 1" "same as previous"
+set bot_ai_custom_weapon_priority_distances "200 1000"	"Define close and far distances in any order, the bots will detect middle distances automatically. "
+set bot_ai_custom_weapon_priority_far "11 7 15 14 4 5 8 13 6 1 3 9 2"	"Desired weapons in any order. Up to the max ammount of weapons available in the system "
+set bot_ai_custom_weapon_priority_mid "11 9 4 5 3 7 15 14 6 13 8 2 1"	"same as previous "
+set bot_ai_custom_weapon_priority_close "11 3 9 13 14 8 6 4 2 5 7 15 1"	"same as previous"
 set bot_ai_weapon_combo 1	"Enable weapon combos "
 set bot_ai_weapon_combo_threshold 0.3	"Try to make a combo N seconds after the last attack"
 set bot_ai_friends_aware_pickup_radius "500"
 
 // waypoint editor enable
 set g_waypointeditor 0
-set bot_ignore_bots 0	 "When set, bots don't shoot at other bots"
+set bot_ignore_bots 0	"When set, bots don't shoot at other bots"
 set bot_join_empty 0	"When set, bots also play if no player has joined the server"
 set bot_vs_human 0	"Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count)"
 
@@ -383,10 +383,10 @@
 set g_powerup_shield 1
 set g_use_ammunition 1
 set g_pickup_items 1
-set g_minstagib 0		"enable	minstagib"
-set g_minstagib_extralives 2	"how	many extra lives you will get per powerup"
-set g_minstagib_ammo_start 10	"starting	ammo"
-set g_minstagib_ammo_drop 5	"how	much ammo you'll get for weapons or cells"
+set g_minstagib 0		"enable minstagib"
+set g_minstagib_extralives 2	"how many extra lives you will get per powerup"
+set g_minstagib_ammo_start 10	"starting ammo"
+set g_minstagib_ammo_drop 5	"how much ammo you'll get for weapons or cells"
 set g_minstagib_invis_alpha 0.05
 set g_minstagib_speed_jumpheight 1.8
 set g_minstagib_speed_moverate 1.25
@@ -408,7 +408,7 @@
 set g_throughfloor 1
 set g_maplist_mostrecent ""
 seta g_maplist_mostrecent_count 3	"number of most recent maps that are blocked from being played again"
-seta g_maplist "aggressor	aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone dieselpower dismal downer evilspace farewell final_rage reslimed ruiner runningman_1on1remix runningman runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
+seta g_maplist "aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone dieselpower dismal downer evilspace farewell final_rage reslimed ruiner runningman_1on1remix runningman runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
 seta g_maplist_index 0	"this is used internally for saving position in maplist cycle"
 seta g_maplist_selectrandom 0	"if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle"
 seta g_maplist_shuffle 1	"new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list."
@@ -421,9 +421,9 @@
 set g_player_brightness 0	"set to 2 for brighter players"
 seta g_balance_cloaked_alpha 0.25
 
-set welcome_message_time		8
+set welcome_message_time 8
 
-alias clearmap	"disconnect"
+alias clearmap "disconnect"
 
 set g_grappling_hook 0
 set g_balance_grapplehook_health 130
@@ -468,21 +468,21 @@
 seta timelimit_maxovertime 5
 
 // common team values
-set g_tdm				0
+set g_tdm 0
 
-seta teamplay_default			4	"default teamplay	setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
+seta teamplay_defaul 4	"default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
 seta g_mirrordamage 0.3	"for teamplay 4: mirror damage factor"
 seta g_friendlyfire 0.1	"for teamplay 4: fiendly fire factor"
-seta g_teamdamage_threshold 	50	"for teamplay 4: threshold over which to apply mirror damage"
+seta g_teamdamage_threshold 50	"for teamplay 4: threshold over which to apply mirror damage"
 seta g_teamdamage_resetspeed 30	"for teamplay 4: how fast player's teamdamage count decreases"
 
-set deathmatch_force_teamplay		0	"Always play	TDM instead of DM"
-seta g_balance_teams			0	"automatically balance	out players entering instead of asking them for their preferred team"
-seta g_balance_teams_force		0	"automatically balance	out teams when players move or disconnect"
-seta g_balance_teams_prevent_imbalance	0	"prevent players	from changing to larger teams"
-seta g_tdm_teams			2	"how many	teams are in team deathmatch"
-set g_changeteam_banned			0	"not allowed	to change team"
-set g_changeteam_fragtransfer		0	"% of	frags you get to keep when you change teams (rounded down)"
+set deathmatch_force_teamplay		0	"Always play TDM instead of DM"
+seta g_balance_teams			0	"automatically balance out players entering instead of asking them for their preferred team"
+seta g_balance_teams_force		0	"automatically balance out teams when players move or disconnect"
+seta g_balance_teams_prevent_imbalance	0	"prevent players from changing to larger teams"
+seta g_tdm_teams			2	"how many teams are in team deathmatch"
+set g_changeteam_banned			0	"not allowed to change team"
+set g_changeteam_fragtransfer		0	"% of frags you get to keep when you change teams (rounded down)"
 
 // dm
 set g_dm 1
@@ -510,15 +510,15 @@
 set g_runematch						0
 set g_runematch_pointrate				5
 set g_runematch_pointamt					1
-set g_runematch_shuffletime				30 "how	often runes change position"
-set g_runematch_respawntime				15 "how	soon after being dropped to respawn"
+set g_runematch_shuffletime				30 "how often runes change position"
+set g_runematch_respawntime				15 "how soon after being dropped to respawn"
 set g_runematch_frags_killedby_runeholder		4
 set g_runematch_frags_killed_runeholder			5
 set g_runematch_frags_norune				0
-set g_runematch_drop_runes_max				2 "only	drop up to 2 runes, the rest should respawn"
-set g_runematch_allow_same				0 "allow	matching rune-curse pairs"
+set g_runematch_drop_runes_max				2 "only drop up to 2 runes, the rest should respawn"
+set g_runematch_allow_same				0 "allow matching rune-curse pairs"
 set g_runematch_rune_alpha				0.78
-set g_runematch_rune_effects				544 "EF_ADDITIVE	+ EF_FULLBRIGHT = 544"
+set g_runematch_rune_effects				544 "EF_ADDITIVE + EF_FULLBRIGHT = 544"
 set g_runematch_rune_glow_size				0
 set g_runematch_rune_glow_color				0
 set g_runematch_rune_color_strength			1.0
@@ -564,12 +564,12 @@
 
 // domination
 set g_domination			0
-set g_domination_default_teams		2 "default	number of teams for maps that aren't domination-specific"
-set g_domination_disable_frags		0 "players	can't get frags normally, only get points from kills"
-set g_domination_point_amt		0 "override:	how many points to get per ping"
-set g_domination_point_rate		0 "override:	how often to give those points"
-set g_domination_point_capturetime	0.1 "how	long it takes to capture a point (given no interference)"
-set g_domination_point_glow		0 "domination	point glow (warning, slow)"
+set g_domination_default_teams		2 "default number of teams for maps that aren't domination-specific"
+set g_domination_disable_frags		0 "players can't get frags normally, only get points from kills"
+set g_domination_point_amt		0 "override: how many points to get per ping"
+set g_domination_point_rate		0 "override: how often to give those points"
+set g_domination_point_capturetime	0.1 "how long it takes to capture a point (given no interference)"
+set g_domination_point_glow		0 "domination point glow (warning, slow)"
 //set g_domination_balance_team_points	1 "# of points received is based on team sizes"
 
 // last man standing
@@ -586,15 +586,15 @@
 set g_lms_campcheck_message "^1Don't	camp!"
 set g_lms_campcheck_damage 100
 set g_lms_campcheck_distance 1800
-set g_lms_last_join 3			"if	g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives"
-set g_lms_join_anytime 1		"if	true, new players can join, but get same amount of lives as the worst player"
+set g_lms_last_join 3			"if g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives"
+set g_lms_join_anytime 1		"if true, new players can join, but get same amount of lives as the worst player"
 
 // arena
 set g_arena 0
-set g_arena_maxspawned 2	"maximum	number of players to spawn at once (the rest is spectating, waiting for their turn)"
-set g_arena_roundbased 1	"if	disabled, the next player will spawn as soon as someone dies"
-set g_arena_warmup 5		"time,	newly spawned players have to prepare themselves in round based matches"
-set g_arena_powerups 0		"enables	powerups (superhealth, strength and shield), which are removed by default"
+set g_arena_maxspawned 2	"maximum number of players to spawn at once (the rest is spectating, waiting for their turn)"
+set g_arena_roundbased 1	"if disabled, the next player will spawn as soon as someone dies"
+set g_arena_warmup 5		"time, newly spawned players have to prepare themselves in round based matches"
+set g_arena_powerups 0		"enables powerups (superhealth, strength and shield), which are removed by default"
 
 // onslaught
 set g_onslaught 0
@@ -832,10 +832,10 @@
 bind kp_plus "+userbind 17"
 bind kp_minus "+userbind 18"
 
-set sv_vote_commands "restart	fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick cointoss" "these commands can be voted"
+set sv_vote_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick cointoss" "these commands can be voted"
 set sv_vote_only_commands ""
 set sv_vote_master_commands ""	"maybe add kickban here (but then sv_vote_master 0)"
-set rcon_restricted_commands "restart	fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\""
+set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\""
 set sv_vote_call 1	"users can call a vote for the above commands"
 set sv_vote_master 1	"users can call a vote to become master"
 set sv_vote_master_password ""	"when set, users can use \"vdo login (password)\" to log in as master"
@@ -887,10 +887,10 @@
 set g_balance_nixnex_ammoincr_cells 2
 
 // score log
-set sv_logscores_console 0		"print	scores to server console"
-set sv_logscores_file 0			"print	scores to file"
+set sv_logscores_console 0		"print scores to server console"
+set sv_logscores_file 0			"print scores to file"
 set sv_logscores_filename scores.log	"filename"
-set sv_logscores_bots 0			"exclude	bots by default"
+set sv_logscores_bots 0			"exclude bots by default"
 
 // spam (frag/capture) log
 set sv_eventlog 0	"the master switch for efficiency reasons"
@@ -1053,38 +1053,38 @@
 alias _settemp_restore_1 "$1 \"${$2}\"; _settemp_restore_${3- asis}"
 
 // usercommands. These can be edited and bound by the menu.
-seta "userbind1_press" "say_team	quad soon";  seta "userbind1_release" "";  seta "userbind1_description" "team: quad soon"
-seta "userbind2_press" "say_team	free item %x^7 (l:%y^7); g_waypointsprite_team_here_p";  seta "userbind2_release" "";  seta "userbind2_description" "team: free item, icon"
-seta "userbind3_press" "say_team	took item (l:%l^7); g_waypointsprite_team_here";  seta "userbind3_release" "";  seta "userbind3_description" "team: took item, icon"
-seta "userbind4_press" "say_team	negative";  seta "userbind4_release" "";  seta "userbind4_description" "team: negative"
-seta "userbind5_press" "say_team	positive";  seta "userbind5_release" "";  seta "userbind5_description" "team: positive"
-seta "userbind6_press" "say_team	need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_helpme; cmd voice needhelp";  seta "userbind6_release" "";  seta "userbind6_description" "team: need help, icon"
-seta "userbind7_press" "say_team	enemy seen (l:%y^7); g_waypointsprite_team_danger_p; cmd voice incoming";  seta "userbind7_release" "";  seta "userbind7_description" "team: enemy seen, icon"
-seta "userbind8_press" "say_team	flag seen (l:%y^7); g_waypointsprite_team_here_p; cmd voice seenflag";  seta "userbind8_release" "";  seta "userbind8_description" "team: flag seen, icon"
-seta "userbind9_press" "say_team	defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind9_release" "";  seta "userbind9_description" "team: defending, icon"
-seta "userbind10_press" "say_team	roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind10_release" "";  seta "userbind10_description" "team: roaming, icon"
-seta "userbind11_press" "say_team	attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind11_release" "";  seta "userbind11_description" "team: attacking, icon"
-seta "userbind12_press" "say_team	killed flagcarrier (l:%y^7); g_waypointsprite_team_p"; seta "userbind12_release" ""; seta "userbind12_description" "team: killed flag, icon"
-seta "userbind13_press" "say_team	dropped flag (l:%d^7); g_waypointsprite_team_here_d"; seta "userbind13_release" ""; seta "userbind13_description" "team: dropped flag, icon"
-seta "userbind14_press" "say_team	dropped gun %w (l:%l^7); g_waypointsprite_team_here; wait; dropweapon"; seta "userbind14_release" ""; seta "userbind14_description" "team: drop gun, icon"
-seta "userbind15_press" "say_team	dropped flag/key %w (l:%l^7); g_waypointsprite_team_here; wait; +use"; seta "userbind15_release" "-use"; seta "userbind15_description" "team: drop flag/key, icon"
-seta "userbind16_press" "say	:-) / nice one"; seta "userbind16_release" ""; seta "userbind16_description" "chat: nice one"
-seta "userbind17_press" "say	good game"; seta "userbind17_release" ""; seta "userbind17_description" "chat: good game"
-seta "userbind18_press" "say	hi / good luck and have fun"; seta "userbind18_release" ""; seta "userbind18_description" "chat: hi / good luck"
-seta "userbind19_press" "+showscores;	+con_chat_maximize"; seta "userbind19_release" "-showscores; -con_chat_maximize"; seta "userbind19_description" "scoreboard / chat history"
-seta "userbind20_press" "toggle	cl_capturevideo"; seta "userbind20_release" ""; seta "userbind20_description" "toggle recording .avi"
-seta "userbind21_press" "toggle	vid_fullscreen; vid_restart"; seta "userbind21_release" ""; seta "userbind21_description" "toggle fullscreen"
-seta "userbind22_press" "";	seta "userbind22_release" ""; seta "userbind22_description" ""
-seta "userbind23_press" "";	seta "userbind23_release" ""; seta "userbind23_description" ""
-seta "userbind24_press" "";	seta "userbind24_release" ""; seta "userbind24_description" ""
-seta "userbind25_press" "";	seta "userbind25_release" ""; seta "userbind25_description" ""
-seta "userbind26_press" "";	seta "userbind26_release" ""; seta "userbind26_description" ""
-seta "userbind27_press" "";	seta "userbind27_release" ""; seta "userbind27_description" ""
-seta "userbind28_press" "";	seta "userbind28_release" ""; seta "userbind28_description" ""
-seta "userbind29_press" "";	seta "userbind29_release" ""; seta "userbind29_description" ""
-seta "userbind30_press" "";	seta "userbind30_release" ""; seta "userbind30_description" ""
-seta "userbind31_press" "";	seta "userbind31_release" ""; seta "userbind31_description" ""
-seta "userbind32_press" "";	seta "userbind32_release" ""; seta "userbind32_description" ""
+seta "userbind1_press" "say_team quad soon";  seta "userbind1_release" "";  seta "userbind1_description" "team: quad soon"
+seta "userbind2_press" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p";  seta "userbind2_release" "";  seta "userbind2_description" "team: free item, icon"
+seta "userbind3_press" "say_team took item (l:%l^7); g_waypointsprite_team_here";  seta "userbind3_release" "";  seta "userbind3_description" "team: took item, icon"
+seta "userbind4_press" "say_team negative";  seta "userbind4_release" "";  seta "userbind4_description" "team: negative"
+seta "userbind5_press" "say_team positive";  seta "userbind5_release" "";  seta "userbind5_description" "team: positive"
+seta "userbind6_press" "say_team need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_helpme; cmd voice needhelp";  seta "userbind6_release" "";  seta "userbind6_description" "team: need help, icon"
+seta "userbind7_press" "say_team enemy seen (l:%y^7); g_waypointsprite_team_danger_p; cmd voice incoming";  seta "userbind7_release" "";  seta "userbind7_description" "team: enemy seen, icon"
+seta "userbind8_press" "say_team flag seen (l:%y^7); g_waypointsprite_team_here_p; cmd voice seenflag";  seta "userbind8_release" "";  seta "userbind8_description" "team: flag seen, icon"
+seta "userbind9_press" "say_team defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind9_release" "";  seta "userbind9_description" "team: defending, icon"
+seta "userbind10_press" "say_team roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind10_release" "";  seta "userbind10_description" "team: roaming, icon"
+seta "userbind11_press" "say_team attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind11_release" "";  seta "userbind11_description" "team: attacking, icon"
+seta "userbind12_press" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_p"; seta "userbind12_release" ""; seta "userbind12_description" "team: killed flag, icon"
+seta "userbind13_press" "say_team dropped flag (l:%d^7); g_waypointsprite_team_here_d"; seta "userbind13_release" ""; seta "userbind13_description" "team: dropped flag, icon"
+seta "userbind14_press" "say_team dropped gun %w (l:%l^7); g_waypointsprite_team_here; wait; dropweapon"; seta "userbind14_release" ""; seta "userbind14_description" "team: drop gun, icon"
+seta "userbind15_press" "say_team dropped flag/key %w (l:%l^7); g_waypointsprite_team_here; wait; +use"; seta "userbind15_release" "-use"; seta "userbind15_description" "team: drop flag/key, icon"
+seta "userbind16_press" "say :-) / nice one"; seta "userbind16_release" ""; seta "userbind16_description" "chat: nice one"
+seta "userbind17_press" "say good game"; seta "userbind17_release" ""; seta "userbind17_description" "chat: good game"
+seta "userbind18_press" "say hi / good luck and have fun"; seta "userbind18_release" ""; seta "userbind18_description" "chat: hi / good luck"
+seta "userbind19_press" "+showscores; +con_chat_maximize"; seta "userbind19_release" "-showscores; -con_chat_maximize"; seta "userbind19_description" "scoreboard / chat history"
+seta "userbind20_press" "toggle cl_capturevideo"; seta "userbind20_release" ""; seta "userbind20_description" "toggle recording .avi"
+seta "userbind21_press" "toggle vid_fullscreen; vid_restart"; seta "userbind21_release" ""; seta "userbind21_description" "toggle fullscreen"
+seta "userbind22_press" ""; seta "userbind22_release" ""; seta "userbind22_description" ""
+seta "userbind23_press" ""; seta "userbind23_release" ""; seta "userbind23_description" ""
+seta "userbind24_press" ""; seta "userbind24_release" ""; seta "userbind24_description" ""
+seta "userbind25_press" ""; seta "userbind25_release" ""; seta "userbind25_description" ""
+seta "userbind26_press" ""; seta "userbind26_release" ""; seta "userbind26_description" ""
+seta "userbind27_press" ""; seta "userbind27_release" ""; seta "userbind27_description" ""
+seta "userbind28_press" ""; seta "userbind28_release" ""; seta "userbind28_description" ""
+seta "userbind29_press" ""; seta "userbind29_release" ""; seta "userbind29_description" ""
+seta "userbind30_press" ""; seta "userbind30_release" ""; seta "userbind30_description" ""
+seta "userbind31_press" ""; seta "userbind31_release" ""; seta "userbind31_description" ""
+seta "userbind32_press" ""; seta "userbind32_release" ""; seta "userbind32_description" ""
 alias _userbind_call "${$1}"
 alias +userbind "_userbind_call userbind${1}_press"
 alias -userbind "_userbind_call userbind${1}_release"
@@ -1146,15 +1146,15 @@
 alias -con_chat_maximize "_restore_con_chatvars"
 
 // tab completion
-set con_completion_playdemo *.dem
-set con_completion_timedemo *.dem
-set con_completion_ply 	    *.dem
-set con_completion_tdem 	   *.dem
-set con_completion_exec 	   *.cfg
-set con_completion_chmap 	  map
-set con_completion_gotomap 	map
-set con_completion_vmap 	   map
-set con_completion_vdomap 	 map
+set con_completion_playdemo	*.dem
+set con_completion_timedemo	*.dem
+set con_completion_ply		*.dem
+set con_completion_tdem		*.dem
+set con_completion_exec		*.cfg
+set con_completion_chmap	map
+set con_completion_gotomap	map
+set con_completion_vmap		map
+set con_completion_vdomap	map
 
 // these non-saved engine cvars shall be savedG
 seta cl_port $cl_port
@@ -1223,16 +1223,16 @@
 alias allready "sv_cmd allready"
 
 // note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh.
-seta cl_weaponpriority "14	13 9 8 11 7 6 5 4 15 3 2 1 10 12" "default porto and hook as LOW priority, use the weapon key numbers otherwise"
+seta cl_weaponpriority "14 13 9 8 11 7 6 5 4 15 3 2 1 10 12" "default porto and hook as LOW priority, use the weapon key numbers otherwise"
 seta cl_weaponpriority_useforcycling 0
 // impulse 200, 210, 220:
-seta cl_weaponpriority0 "14	9 8 4"    "explosives    (RL Hagar Mortar)"
+seta cl_weaponpriority0 "14 9 8 4"    "explosives    (RL Hagar Mortar)"
 // impulse 201, 211, 221:
-seta cl_weaponpriority1 "13	7 6 5 1"  "energy        (Nex Crylink Electro Laser)"
-seta cl_weaponpriority2 "15	11 7 3"   "hitscan exact (Nex MG)"
-seta cl_weaponpriority3 "15	11 7 3 2" "hitscan all   (Nex MG Shotgun)"
-seta cl_weaponpriority4 "13	8 6 5 2"  "spam          (Hagar Crylink Electro Shotgun)"
-seta cl_weaponpriority5 "1	12 10"     "for moving    (Laser Hook Port-O-Launch)"
+seta cl_weaponpriority1 "13 7 6 5 1"  "energy        (Nex Crylink Electro Laser)"
+seta cl_weaponpriority2 "15 11 7 3"   "hitscan exact (Nex MG)"
+seta cl_weaponpriority3 "15 11 7 3 2" "hitscan all   (Nex MG Shotgun)"
+seta cl_weaponpriority4 "13 8 6 5 2"  "spam          (Hagar Crylink Electro Shotgun)"
+seta cl_weaponpriority5 "1 12 10"     "for moving    (Laser Hook Port-O-Launch)"
 seta cl_weaponpriority6 ""
 seta cl_weaponpriority7 ""
 seta cl_weaponpriority8 ""
@@ -1266,8 +1266,8 @@
 seta cl_teamradar_foreground_alpha 0.8	"alpha of the map"
 seta cl_teamradar_scale 4096
 seta cl_teamradar_rotation 0	"rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
-seta cl_teamradar_size "128	128"
-seta cl_teamradar_position "0	0" "1 1 would be lower right corner, 0.5 0.5 the center (ARGH) :P"
+seta cl_teamradar_size "128 128"
+seta cl_teamradar_position "0 0" "1 1 would be lower right corner, 0.5 0.5 the center (ARGH) :P"
 seta cl_teamradar_zoommode 0	"zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
 alias cl_teamradar_rotate "toggle cl_teamradar_rotation 0 1 2 3 4"
 
@@ -1377,20 +1377,20 @@
 alias camera_enable "set cl_demo_mousegrab 1; set _chase_active $chase_active; chase_active 2;" // Enables the camera for demo playback
 alias camera_disable "set cl_demo_mousegrab 0; chase_active $_chase_active;" // Disables the camera for demo playback
 
-set camera_speed_roll 0.9		"Camera	rotation speed "
-set camera_speed_chase 4		"Camera	movement speed on the x/y/z axis while chasing the player"
-set camera_speed_free 8			"Camera	movement speed on the x/y/z axis in free mode"
-set camera_speed_attenuation 30		"Camera	movements attenuation factor. Bigger is smoother. Applies to mouse movements."
-set camera_free 0			"Free	camera instead of chasing the player"
-set camera_reset 0			"Reset	the camera position"
-set camera_direction_x 0		"Move	the camera on the x axis (relative to the camera angle)"
-set camera_direction_y 0		"Move	the camera on the y axis (relative to the camera angle)"
-set camera_direction_z 0		"Move	the camera on the z axis (relative to the camera rotation)"
-set camera_mouse_treshold 0.5		"Use	to ignore small mouse movements. This allows for smoother camera control"
-set camera_chase_smoothly 0		"Attenuate	player movements (only in chase mode)"
-set camera_look_player	0		"Always look	to the player. Mouse input is ignored in this mode."
-set camera_look_attenuation 	8	"Attenuation	of \"looking\" movements, only if camera_look_player is set. Bigger is smoother."
-set camera_forward_follows 0		"0:	Move the camera forwards without changing altitude. 1: Move towards what you are looking."
+set camera_speed_roll 0.9		"Camera rotation speed "
+set camera_speed_chase 4		"Camera movement speed on the x/y/z axis while chasing the player"
+set camera_speed_free 8			"Camera movement speed on the x/y/z axis in free mode"
+set camera_speed_attenuation 30		"Camera movements attenuation factor. Bigger is smoother. Applies to mouse movements."
+set camera_free 0			"Free camera instead of chasing the player"
+set camera_reset 0			"Reset the camera position"
+set camera_direction_x 0		"Move the camera on the x axis (relative to the camera angle)"
+set camera_direction_y 0		"Move the camera on the y axis (relative to the camera angle)"
+set camera_direction_z 0		"Move the camera on the z axis (relative to the camera rotation)"
+set camera_mouse_treshold 0.5		"Use to ignore small mouse movements. This allows for smoother camera control"
+set camera_chase_smoothly 0		"Attenuate player movements (only in chase mode)"
+set camera_look_player	0		"Always look to the player. Mouse input is ignored in this mode."
+set camera_look_attenuation 	8	"Attenuation of \"looking\" movements, only if camera_look_player is set. Bigger is smoother."
+set camera_forward_follows 0		"0: Move the camera forwards without changing altitude. 1: Move towards what you are looking."
 
 alias +camera_move_forward "set camera_direction_x 1"
 alias -camera_move_forward "set camera_direction_x 0"

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-01-23 14:40:08 UTC (rev 5648)
+++ trunk/data/qcsrc/server/constants.qh	2009-01-23 15:07:58 UTC (rev 5649)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "913e35a06d0542e7ba625bfe0e0844c9";
+string CVAR_CHECK_DEFAULT = "a53e77007f17570086417cc970eacf6e";
 string CVAR_CHECK_WEAPONS = "2a35f7139825257d468d22354209cf54";
 float	FALSE					= 0;
 float	TRUE					= 1;




More information about the nexuiz-commits mailing list