From f980a3e8b93bde92135227fd6d75f3dc7da783e7 Mon Sep 17 00:00:00 2001
From: esteel <esteel@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 19 Feb 2009 21:04:19 +0000
Subject: [PATCH] show the WelcomeMessage only on join for welcome_message_time
 seconds or when +show_info if pressed because many people did not know you
 can make this msg disappear with +zoom.\ add a line telling specs and
 observers about +show_info in the upper right

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5900 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/client/sbar.qc      |  3 +++
 data/qcsrc/server/cl_client.qc | 21 +++------------------
 data/qcsrc/server/teamplay.qc  |  7 +++----
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 31dbc990a..953b306c8 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1764,6 +1764,9 @@ void Sbar_Draw (void)
 			s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe");
 		o = Sbar_DrawNoteLine(o, s);
 
+		s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info");
+		o = Sbar_DrawNoteLine(o, s);
+
 		if(gametype == GAME_ARENA)
 			s = "^1Wait for your turn to join";
 		else if(gametype == GAME_LMS)
diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 969c178f1..4bc62d5cb 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -74,7 +74,6 @@ void ClientData_Touch(entity e)
 
 #define SPAWNPOINT_SCORE frags
 
-.float wantswelcomemessage;
 .string netname_previous;
 
 void spawnfunc_info_player_survivor (void)
@@ -564,7 +563,6 @@ void PutObserverInServer (void)
 	self.punchvector = '0 0 0';
 	self.oldvelocity = self.velocity;
 	self.customizeentityforclient = Client_customizeentityforclient;
-	self.wantswelcomemessage = 1;
 
 	if(g_arena)
 	{
@@ -1869,7 +1867,6 @@ float SpectateNext() {
 		msg_entity = self;
 		WriteByte(MSG_ONE, SVC_SETVIEW);
 		WriteEntity(MSG_ONE, self.enemy);
-		self.wantswelcomemessage = 1;
 	 	//stuffcmd(self, "set viewsize $tmpviewsize \n");
 		if(!SpectateUpdate())
 			PutObserverInServer();
@@ -2029,10 +2026,7 @@ void ObserverThink()
 			self.flags |= FL_JUMPRELEASED;
 		}
 	}
-	if(self.BUTTON_ZOOM)
-		self.wantswelcomemessage = 0;
-	if(self.wantswelcomemessage)
-		PrintWelcomeMessage(self);
+	PrintWelcomeMessage(self);
 }
 
 void SpectatorThink()
@@ -2066,10 +2060,7 @@ void SpectatorThink()
 			self.flags |= FL_JUMPRELEASED;
 		}
 	}
-	if(self.BUTTON_ZOOM)
-		self.wantswelcomemessage = 0;
-	if(self.wantswelcomemessage)
-		PrintWelcomeMessage(self);
+	PrintWelcomeMessage(self);
 	self.flags |= FL_CLIENT | FL_NOTARGET;
 }
 
@@ -2150,12 +2141,7 @@ void PlayerPreThink (void)
 
 		CheckRules_Player();
 
-		if(self.BUTTON_INFO)
-			PrintWelcomeMessage(self);
-
-		if(g_lms || !cvar("sv_spectate"))
-		if((time - self.jointime) <= cvar("welcome_message_time"))
-			PrintWelcomeMessage(self);
+		PrintWelcomeMessage(self);
 
 		if (intermission_running)
 		{
@@ -2431,7 +2417,6 @@ void PlayerPostThink (void)
 		if (intermission_running)
 			return;		// intermission or finale
 
-		//PrintWelcomeMessage(self);
 		//if (TetrisPostFrame()) return;
 
 		// restart countdown
diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index 81328db3b..bc80e58e2 100644
--- a/data/qcsrc/server/teamplay.qc
+++ b/data/qcsrc/server/teamplay.qc
@@ -367,11 +367,11 @@ void PrintWelcomeMessage(entity pl)
 {
 	string s, mutator, modifications, motd;
 
-	/*if(self.welcomemessage_time > time)
+	if(self.cvar_scr_centertime == 0) return;
+	if((time - self.jointime) > cvar("welcome_message_time")
+	   && !self.BUTTON_INFO)
 		return;
-	self.welcomemessage_time = time + 0.8; */
 
-	if(self.cvar_scr_centertime == 0) 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(self.welcomemessage_time > time) return;
 		self.welcomemessage_time = time + self.cvar_scr_centertime * 0.6;
@@ -485,7 +485,6 @@ void PrintWelcomeMessage(entity pl)
 	s = strcat(s, "\n");
 
 	centerprint(pl, s);
-	//sprint(pl, s);
 }
 
 
-- 
2.39.2