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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-22 08:54:04 -0400 (Fri, 22 May 2009)
New Revision: 6752

Modified:
   trunk/data/qcsrc/server/teamplay.qc
Log:
clarify welcome message handling in campaign


Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2009-05-22 06:23:00 UTC (rev 6751)
+++ trunk/data/qcsrc/server/teamplay.qc	2009-05-22 12:54:04 UTC (rev 6752)
@@ -381,13 +381,15 @@
 	string s, modifications, motd;
 
 	if(self.cvar_scr_centertime == 0) return;
-	if((time - self.jointime) > cvar("welcome_message_time")
-	   && !self.BUTTON_INFO)
-		return;
 
+	if(!cvar("g_campaign"))
+		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;
-		self.welcomemessage_time = time + self.cvar_scr_centertime * 0.6;
+		self.welcomemessage_time = time + max(0.5, self.cvar_scr_centertime * 0.6);
 	}
 
 	if(cvar("g_campaign"))