Fix compile

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 48a7b58cbcb11cd328219d406f4945df929f9383..7d59ac4a0d0d919aca36460e357326ddc8f60c4f 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -37,6 +37,8 @@ alias -hook -button6
 alias use "impulse 21"
 
 // for backwards compatibility
+// TODO Remove after 0.8 release!
+cl_particles_forcetraileffects 1
 
 alias dropweapon "impulse 17"
 alias +show_info +button7
@@ -243,7 +245,7 @@ set cl_deathglow 0.8 "number of seconds during which dead bodies glow out"
 
 set sv_gibhealth 100 "Minus health a dead body must have in order to get gibbed"
 
-// fragmessage: This allows extra information to be displayed with the frag centerprints. 
+// fragmessage: This allows extra information to be displayed with the frag centerprints.
 set sv_fraginfo 1 "Enable extra frag message information, 0 = Never display, 1 = Display only in warmup mode; 2 = Always display"
 set sv_fraginfo_ping 1 "Enable ping display information, 0 = Never display, 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
 set sv_fraginfo_handicap 1 "Enable handicap display information, 0 = Never display, 1 = Only when the player has handicap on, 2 = Always display (Displays Off if disabled)"
@@ -925,7 +927,7 @@ seta scoreboard_color_bg_team 0.5 "team color multiplier of the scoreboard backg
 seta scoreboard_alpha_bg 0.6 "scoreboard background alpha"
 seta scoreboard_alpha_fg 1 "scoreboard foreground alpha"
 seta scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
-seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" 
+seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self"
 seta scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
 seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
 seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
@@ -994,19 +996,22 @@ set con_completion_vnextmap       map
 set con_completion_vdomap      map
 set con_completion_playermodel models/player/*.iqm
 
+// helper
 // these non-saved engine cvars shall be saved
-seta cl_port $cl_port
-seta r_showsurfaces $r_showsurfaces
-seta r_ambient $r_ambient
-seta skill 4
-seta gl_finish $gl_finish
-seta v_kicktime $v_kicktime
-seta r_subdivisions_tolerance $r_subdivisions_tolerance
-seta vid_gl20 $vid_gl20
-seta vid_gl13 $vid_gl13
-seta r_drawviewmodel $r_drawviewmodel
-seta v_idlescale $v_idlescale
-seta net_slist_queriespersecond $net_slist_queriespersecond
+alias makesaved "seta $1 \"${$1 ?}\"
+makesaved cl_maxfps_alwayssleep
+makesaved cl_port
+makesaved gl_finish
+makesaved net_slist_queriespersecond
+makesaved r_ambient
+makesaved r_drawviewmodel
+makesaved r_showsurfaces
+makesaved r_subdivisions_tolerance
+makesaved skill
+makesaved vid_gl13
+makesaved vid_gl20
+makesaved v_idlescale
+makesaved v_kicktime
 
 // ticrate
 //sys_ticrate 0.0166667
@@ -1096,7 +1101,7 @@ set sv_clones 0   "number of clones a player may make (reset by the \"kill\" comma
 
 set cl_handicap 1      "the higher, the more damage you will receive (client setting) NOTE: reconnect or use sendcvar command to update the choice."
 
-seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such. (client setting) NOTE: reconnect or use sendcvar command to update the choice." 
+seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such. (client setting) NOTE: reconnect or use sendcvar command to update the choice."
 
 seta cl_autoscreenshot 1 "Take a screenshot upon the end of a match... 0 = Disable completely, 1 = Allow sv_autoscreenshot to take a screenshot when requested, 2 = Always take an autoscreenshot anyway."
 
@@ -1221,7 +1226,7 @@ seta cl_casings_maxcount 100 "maximum amount of shell casings (must be at least
 seta cl_gibs_maxcount 100 "maximum amount of gibs (must be at least 1)"
 seta cl_vehicle_spiderbot_cross_alpha 0.6
 seta cl_vehicle_spiderbot_cross_size 1
-seta cl_vehicles_hudscale 0.5 
+seta cl_vehicles_hudscale 0.5
 seta cl_vehicles_hudalpha 0.75
 seta cl_vehicles_hud_tactical 1
 
@@ -1518,7 +1523,7 @@ exec _hud_descriptions.cfg
 exec hud_luminos.cfg
 
 
-// ... and now that everything is configured/aliased, we can do some things: 
+// ... and now that everything is configured/aliased, we can do some things:
 
 // Change g_start_delay based upon if the server is local or not.
 if_client set g_start_delay 0  "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server"