Merge branch 'master' into Mario/monsters

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 495473e3e43f93455a69de2bfe57af9178a33035..c5275cc9521257cd688ff3ea3653745df2d661b3 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
@@ -1050,19 +1052,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