From ebe7a434ef849356d5cbb154c94895990a1a8cad Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 31 Mar 2009 13:37:36 +0000 Subject: [PATCH] some minor centerprint fixes git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6392 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 3 ++- data/qcsrc/server/teamplay.qc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 9331ac0b6..e80f99a01 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1975,7 +1975,8 @@ void LeaveSpectatorMode() PutClientInServer(); if(!(self.flags & FL_NOTARGET)) bprint ("^4", self.netname, "^4 is playing now\n"); - centerprint(self,""); + if(!cvar("g_campaign")) + centerprint(self,""); // clear MOTD return; } else { stuffcmd(self,"menu_showteamselect\n"); diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index 4d6f220c6..7e1ced5c6 100644 --- a/data/qcsrc/server/teamplay.qc +++ b/data/qcsrc/server/teamplay.qc @@ -373,7 +373,7 @@ void PrintWelcomeMessage(entity pl) && !self.BUTTON_INFO) return; - if( !(timeoutStatus >= 1 || (time < game_starttime) ) ) { //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( !(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; } -- 2.39.2