From: Mario <mario@smbclan.net>
Date: Sun, 27 Aug 2017 19:43:51 +0000 (+1000)
Subject: Move _cl_playermodel back into defaultXonotic.cfg (currently used on both server... 
X-Git-Tag: xonotic-v0.8.5~2496
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9097df470aa415c3b7807c627558e63799bc6785;p=xonotic%2Fxonotic-data.pk3dir.git

Move _cl_playermodel back into defaultXonotic.cfg (currently used on both server and client as an emergency fallback)
---

diff --git a/defaultClient.cfg b/defaultClient.cfg
index c12f69fee..e4904ff58 100644
--- a/defaultClient.cfg
+++ b/defaultClient.cfg
@@ -33,7 +33,6 @@ mod_q3bsp_lightmapmergepower 4
 _cl_color "112.211" // same effect as 112, but menuqc can detect this as the default and not intentionally set
 _cl_name ""
 seta _cl_gender 0 "storage cvar for current player gender (0 = undisclosed, 1 = male, 2 = female)"
-_cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 
 seta cl_reticle 1 "enable zoom reticles"
diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b3b23fec7..eb6c72a56 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -29,6 +29,8 @@ exec defaultServer.cfg
 
 set ekg 0	"Throw huge amounts of gibs"
 
+_cl_playermodel "models/player/erebus.iqm"
+
 locs_enable 0
 pausable 0
 set samelevel 0 "when 1, always play the same level over and over again"