r2160 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2007-02-06 08:29:40 -0500 (Tue, 06 Feb 2007)
New Revision: 2160

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/teamplay.qc
Log:
removed unused welcomemessage_time and renamed welcomemessage_time2, made welcomemessage_time only use self.cvar_scr_centertime * 0.6


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-02-06 12:42:16 UTC (rev 2159)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-02-06 13:29:40 UTC (rev 2160)
@@ -716,8 +716,7 @@
 
 	bprint("\n");
 
-	self.welcomemessage_time = time + cvar("welcome_message_time");
-	self.welcomemessage_time2 = 0;
+	self.welcomemessage_time = 0;
 
 	stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
 	// TODO: is this being used for anything else than cd tracks?

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2007-02-06 12:42:16 UTC (rev 2159)
+++ trunk/data/qcsrc/server/defs.qh	2007-02-06 13:29:40 UTC (rev 2160)
@@ -178,7 +178,6 @@
 
 
 .float welcomemessage_time;
-.float welcomemessage_time2;
 .float version;
 
 // stahl's voting

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2007-02-06 12:42:16 UTC (rev 2159)
+++ trunk/data/qcsrc/server/teamplay.qc	2007-02-06 13:29:40 UTC (rev 2160)
@@ -300,16 +300,20 @@
 {
 	string s, mutator, modifications, padding;
 
-	/*if(self.welcomemessage_time < time)
+	/*if(self.welcomemessage_time > time)
 		return;
-	if(self.welcomemessage_time2 > time)
-		return;
-	self.welcomemessage_time2 = time + 0.8; */
+	self.welcomemessage_time = time + 0.8; */
 
 	if(self.cvar_scr_centertime == 0) return;
-	if(self.welcomemessage_time2 > time) return;
-	self.welcomemessage_time2 = time + self.cvar_scr_centertime * 0.8;
+	if(self.welcomemessage_time > time) return;
+	self.welcomemessage_time = time + self.cvar_scr_centertime * 0.6;
 
+	if(cvar("g_campaign"))
+	{
+		centerprint(pl, campaign_message);
+		return;
+	}
+
 	if(self.classname == "observer")
 	{
 		if(cvar("g_lms") && self.frags <= 0 && self.frags > -666)
@@ -326,12 +330,6 @@
 	}
 
 
-	if(cvar("g_campaign"))
-	{
-		centerprint(pl, campaign_message);
-		return;
-	}
-
 	if(cvar("g_minstagib"))
 		mutator = "^2Minstagib ^1";
 	else if(cvar("g_instagib"))