[nexuiz-commits] r6821 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-31 06:58:06 -0400 (Sun, 31 May 2009)
New Revision: 6821

Modified:
   trunk/data/qcsrc/server/teamplay.qc
Log:
fix campaign welcome msg really


Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2009-05-31 10:54:45 UTC (rev 6820)
+++ trunk/data/qcsrc/server/teamplay.qc	2009-05-31 10:58:06 UTC (rev 6821)
@@ -382,10 +382,16 @@
 
 	if(self.cvar_scr_centertime == 0) return;
 
-	if(!cvar("g_campaign"))
-		if((time - self.jointime) > cvar("welcome_message_time")
-		   && !self.BUTTON_INFO)
+	if(cvar("g_campaign"))
+	{
+		if(self.classname == "player")
 			return;
+	}
+	else
+	{
+		if((time - self.jointime) > cvar("welcome_message_time") && !self.BUTTON_INFO)
+			return;
+	}
 
 	if( !(timeoutStatus >= 1) ) { //really print the WelcomeMessage to the player every frame when timeout-seconds are shown or the game is restarted, to make sure that the shown number is accurate
 		if(self.welcomemessage_time > time) return;