From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 17 Jul 2017 01:31:39 +0000 (+0200)
Subject: argh, it calls other cfg files
X-Git-Tag: xonotic-v0.8.5~2430^2~64
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=84cfba91c72ea03e5928c419578454e8bbf62ca2;p=xonotic%2Fxonotic-data.pk3dir.git

argh, it calls other cfg files
---

diff --git a/defaultClient.cfg b/defaultClient.cfg
index 0f108e723..12dd0aa28 100644
--- a/defaultClient.cfg
+++ b/defaultClient.cfg
@@ -757,3 +757,17 @@ scr_loadingscreen_firstforstartup 1
 scr_loadingscreen_scale 999
 scr_loadingscreen_scale_base 1
 scr_loadingscreen_scale_limit 2
+
+// other config files
+exec effects-normal.cfg
+exec crosshairs.cfg
+exec notifications.cfg
+
+seta cl_physics "default" "client selected physics set"
+
+// hud cvar descriptions and common settings
+exec _hud_common.cfg
+exec _hud_descriptions.cfg
+// exec the default skin config
+// please add any new cvars into the hud_save script in qcsrc/client/hud_config.qc for consistency
+exec hud_luma.cfg
diff --git a/defaultServer.cfg b/defaultServer.cfg
index 94e6f0a4b..1e44d6c59 100644
--- a/defaultServer.cfg
+++ b/defaultServer.cfg
@@ -560,3 +560,12 @@ set g_max_info_autoscreenshot 3 "how many info_autoscreenshot entities are allow
 set g_mod_physics "" "Current physics config name"
 set g_mod_balance "" "Current balance config name"
 set g_mod_config  "" "Current config mod name"
+
+// other config files
+exec balance-xonotic.cfg
+exec physicsX.cfg
+exec turrets.cfg
+exec mutators.cfg
+exec monsters.cfg
+exec minigames.cfg
+exec physics.cfg
diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f1826201c..be9b48464 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -158,30 +158,12 @@ seta snd_channel9volume 1 "QuakeC controlled ambient sound volume"
 snd_identicalsoundrandomization_time -0.1
 snd_identicalsoundrandomization_tics    1
 
-// other config files
-exec balance-xonotic.cfg
-exec effects-normal.cfg
-exec physicsX.cfg
-exec turrets.cfg
-exec crosshairs.cfg
+// FIXME contains both client and server
 exec gamemodes.cfg
-exec mutators.cfg
-exec notifications.cfg
-exec monsters.cfg
-exec minigames.cfg
-exec physics.cfg
 
 // load console command aliases and settings
 exec commands.cfg
 
-// hud cvar descriptions and common settings
-exec _hud_common.cfg
-exec _hud_descriptions.cfg
-// exec the default skin config
-// please add any new cvars into the hud_save script in qcsrc/client/hud_config.qc for consistency
-exec hud_luma.cfg
-
-
 // ... 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.
diff --git a/physics.cfg b/physics.cfg
index b3439d691..88742ff0b 100644
--- a/physics.cfg
+++ b/physics.cfg
@@ -6,8 +6,6 @@
 // ==============
 //  Main options
 // ==============
-seta cl_physics "default" "client selected physics set"
-
 set g_physics_clientselect 0 "allow clients to select their physics set"
 set g_physics_clientselect_options "xonotic nexuiz quake warsow defrag quake3 vecxis quake2 bones"
 set g_physics_clientselect_default "" "override default physics"