From 13e9b58ed26a96606cb5d7c3757005622b028804 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 31 May 2009 10:58:06 +0000 Subject: [PATCH] fix campaign welcome msg really git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6821 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/teamplay.qc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index c116fc21e..d72b61327 100644 --- a/data/qcsrc/server/teamplay.qc +++ b/data/qcsrc/server/teamplay.qc @@ -382,10 +382,16 @@ void PrintWelcomeMessage(entity pl) 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; -- 2.39.2