r5923 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-22 08:05:49 -0500 (Sun, 22 Feb 2009)
New Revision: 5923

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/ctf.qc
Log:
make also CTF skin cvar'red


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-02-22 12:50:10 UTC (rev 5922)
+++ trunk/data/defaultNexuiz.cfg	2009-02-22 13:05:49 UTC (rev 5923)
@@ -27,7 +27,7 @@
 seta g_configversion 0
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 89fb2ff8b300665afbc8f55becf73ff0
+set cvar_check_default b0a00a4f304f7d8fad16a6146442f62d
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -528,8 +528,10 @@
 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"
+set g_ctf_flag_red_model "models/ctf/flags.md3"
+set g_ctf_flag_red_skin 0
+set g_ctf_flag_blue_model "models/ctf/flags.md3"
+set g_ctf_flag_blue_skin 1
 set g_ctf_captimerecord_allow_assisted 0 "if enabled, assisted CTF records (with other players on the server) are recorded too"
 
 exec ctfscoring-div0.cfg
@@ -1189,6 +1191,7 @@
 set con_completion_ply		*.dem
 set con_completion_tdem		*.dem
 set con_completion_exec		*.cfg
+set con_completion_cat		"*.cfg *.txt *.log"
 set con_completion_chmap	map
 set con_completion_gotomap	map
 set con_completion_vmap		map

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-02-22 12:50:10 UTC (rev 5922)
+++ trunk/data/qcsrc/server/constants.qh	2009-02-22 13:05:49 UTC (rev 5923)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "89fb2ff8b300665afbc8f55becf73ff0";
+string CVAR_CHECK_DEFAULT = "b0a00a4f304f7d8fad16a6146442f62d";
 string CVAR_CHECK_WEAPONS = "32e7dc7d745187473f0040d14892e2bb";
 
 float	FALSE					= 0;

Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2009-02-22 12:50:10 UTC (rev 5922)
+++ trunk/data/qcsrc/server/ctf.qc	2009-02-22 13:05:49 UTC (rev 5923)
@@ -735,11 +735,11 @@
 	}
 	self.netname = "^1RED^7 flag";
 	self.target = "###item###";
-	self.skin = 0;
+	self.skin = cvar("g_ctf_flag_red_skin");
 	if(self.spawnflags & 1)
 		self.noalign = 1;
 	if (!self.model)
-		self.model = cvar_string("g_ctf_flag_mdl_red");
+		self.model = cvar_string("g_ctf_flag_red_model");
 	if (!self.noise)
 		self.noise = "ctf/take.wav";
 	if (!self.noise1)
@@ -833,11 +833,11 @@
 	}
 	self.netname = "^4BLUE^7 flag";
 	self.target = "###item###";
-	self.skin = 1;
+	self.skin = cvar("g_ctf_flag_blue_skin");
 	if(self.spawnflags & 1)
 		self.noalign = 1;
 	if (!self.model)
-		self.model = cvar_string("g_ctf_flag_mdl_blue");
+		self.model = cvar_string("g_ctf_flag_blue_model");
 	if (!self.noise)
 		self.noise = "ctf/take.wav";
 	if (!self.noise1)