From: Mario <zacjardine@y7mail.com>
Date: Fri, 17 Apr 2015 04:42:53 +0000 (+1000)
Subject: Less ponies
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c96a3fbcade5fce06e5b76089e0ff08d12e592ea;p=xonotic%2Fxonotic-data.pk3dir.git

Less ponies
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 7e657b12e..f8bd8d050 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -410,7 +410,7 @@ void FixPlayermodel()
 	if(!cvar("g_overkill"))
 	{
 		// public hax
-		if(self.cvar_cl_pony)
+		if(self.cvar_cl_pony && pony_allowed)
 		{
 			defaultmodel = "models/player/pony.iqm";
 			defaultskin = self.cvar_cl_pony_skin;
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 756671192..34a8e08a6 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -567,6 +567,8 @@ const int MIF_GUIDED_TAG = 128;
 .bool cvar_cl_goat;
 .int cvar_cl_charge;
 
+bool pony_allowed;
+
 .string cvar_cl_autovote;
 
 .entity lastkiller;
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index d4d1956f2..7dd41a9f8 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1060,7 +1060,11 @@ void precache()
 
     if(autocvar_sv_allow_customplayermodels)
     {
-        precache_playermodel("models/player/pony.iqm");
+    	if(fexists("models/player/pony.iqm"))
+    	{
+    		pony_allowed = true;
+    		precache_playermodel("models/player/pony.iqm");
+    	}
         precache_playermodel("models/player/renamon.iqm");
         precache_playermodel("models/player/terminusmale.iqm");
         precache_playermodel("models/player/ubot.iqm");