From: Mario <zacjardine@y7mail.com>
Date: Sat, 28 Feb 2015 08:36:26 +0000 (+1100)
Subject: Add something for 2015
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02fd37ff1e4a705b0ed2c0477e8bc06a3113e479;p=xonotic%2Fxonotic-data.pk3dir.git

Add something for 2015
---

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 49bdaa0b1..6231f4805 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -109,6 +109,7 @@ void CSQC_Init(void)
 	registercvar("cl_freeze", "0");
 	registercvar("cl_pony", "0");
 	registercvar("cl_pony_skin", "0");
+	registercvar("cl_goat", "0");
 	registercvar("cl_sparkle", "0");
 	registercvar("cl_multijump", "0");
 	registercvar("cl_dodging", "0");
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 47e2f41ef..94f3a8a94 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -412,6 +412,8 @@ void FixPlayermodel()
 		}
 		if(self.cvar_cl_robot == 1)
 			defaultmodel = "models/player/terminusmale.iqm";
+		if(self.cvar_cl_goat)
+			defaultmodel = "models/player/draconimale.iqm";
 
 		// special hax
 		if(checkinlist(self.crypto_idfp, autocvar_sv_allow_customplayermodels_idlist) || IS_BOT_CLIENT(self))
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index c915e3573..134aac662 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -652,6 +652,7 @@ const int MIF_GUIDED_TAG = 128;
 .int cvar_cl_damnfurries;
 .bool cvar_cl_thestars;
 .bool cvar_cl_robot;
+.bool cvar_cl_goat;
 .int cvar_cl_charge;
 
 .string cvar_cl_autovote;
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 9057014d6..2187b5471 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -469,6 +469,7 @@ void GetCvars(float f)
 	GetCvars_handleFloat(s, f, cvar_cl_sparkle, "cl_sparkle");
 	GetCvars_handleFloat(s, f, cvar_cl_pony, "cl_pony");
 	GetCvars_handleFloat(s, f, cvar_cl_pony_skin, "cl_pony_skin");
+	GetCvars_handleFloat(s, f, cvar_cl_goat, "cl_goat");
 	GetCvars_handleFloat(s, f, cvar_cl_damnfurries, "cl_damnfurries");
 	GetCvars_handleFloat(s, f, cvar_cl_thestars, "cl_thestars");
 	GetCvars_handleFloat(s, f, cvar_cl_robot, "cl_robot");