Move cl_curl_useragent_append and menu_skin to common config

Some classes use menu_skin in server too in their display methods

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 301eadf5493b9a7e1432319ae60193dee038ed7d..c51d17536babf8af1fe79ccf91ea8d23e47f8048 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -406,7 +406,7 @@ cl_curl_enabled 1
 cl_curl_maxdownloads 3
 cl_curl_maxspeed 0
 cl_curl_useragent 1
-cl_curl_useragent_append "$g_xonoticversion"
+//cl_curl_useragent_append is set in xonotic-common.cfg
 
 seta g_waypointsprite_alpha 1 "This allows the client to control transparency of the waypoint"
 seta g_waypointsprite_crosshairfadealpha 0.25 "alpha multiplier near crosshair"
@@ -499,7 +499,6 @@ r_labelsprites_scale 0.40625 // labels sprites get displayed at 0.5x from 640x48
 
 exec binds-xonotic.cfg
 
-seta menu_skin "luma"
 set menu_slowmo 1
 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
 seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or console command (when available) changed or executed by the item"

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index fbae59113fb3bdb22c2d14237992fce0a8a8fc57..cce1d4abcfdffc1092303c3de379f7128a13db1f 100644 (file)
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -42,9 +42,14 @@ set sv_master2 "dpm6.xonotic.xyz:27777"  // gazby, soylent_cow
 set sv_master3 "master3.xonotic.org:27950"
 set sv_master4 "master4.xonotic.org:42863"
 
-// load console command aliases and settings
+// loads console command aliases and settings
+// defines if_client and if_dedicated
 exec commands.cfg
 
+if_client cl_curl_useragent_append "$g_xonoticversion"
+
+seta menu_skin "luma"
+
 // this should be executed only once even on ruleset-votable servers, otherwise the tips would always start from 0
 if_dedicated exec help.cfg