r5915 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-20 13:23:53 -0500 (Fri, 20 Feb 2009)
New Revision: 5915

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/ctf.qc
Log:
g_ctf_flag_mdl_red


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-02-20 18:17:23 UTC (rev 5914)
+++ trunk/data/defaultNexuiz.cfg	2009-02-20 18:23:53 UTC (rev 5915)
@@ -523,6 +523,10 @@
 set g_ctf_shield_min_negscore 20	"shield the player from the flag if he's got -20 points or less"
 set g_ctf_shield_force 100	"push force of the shield"
 
+// fun for server admins
+set g_ctf_flag_mdl_red "models/ctf/flags.md3"
+set g_ctf_flag_mdl_blue "models/ctf/flags.md3"
+
 exec ctfscoring-div0.cfg
 
 // runematch

Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2009-02-20 18:17:23 UTC (rev 5914)
+++ trunk/data/qcsrc/server/ctf.qc	2009-02-20 18:23:53 UTC (rev 5915)
@@ -739,7 +739,7 @@
 	if(self.spawnflags & 1)
 		self.noalign = 1;
 	if (!self.model)
-		self.model = "models/ctf/flags.md3";
+		self.model = cvar_string("g_ctf_flag_mdl_red");
 	if (!self.noise)
 		self.noise = "ctf/take.wav";
 	if (!self.noise1)
@@ -837,7 +837,7 @@
 	if(self.spawnflags & 1)
 		self.noalign = 1;
 	if (!self.model)
-		self.model = "models/ctf/flags.md3";
+		self.model = cvar_string("g_ctf_flag_mdl_blue");
 	if (!self.noise)
 		self.noise = "ctf/take.wav";
 	if (!self.noise1)