r3319 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Jan 30 17:24:21 EST 2008


Author: div0
Date: 2008-01-30 17:24:21 -0500 (Wed, 30 Jan 2008)
New Revision: 3319

Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
make +zoom turn off welcome message when spectating


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-01-30 21:22:29 UTC (rev 3318)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-01-30 22:24:21 UTC (rev 3319)
@@ -1,3 +1,5 @@
+.float wantswelcomemessage;
+
 void info_player_survivor (void)
 {
 	info_player_deathmatch();
@@ -403,6 +405,7 @@
 	self.oldvelocity = self.velocity;
 	self.customizeentityforclient = Client_customizeentityforclient;
 	self.viewzoom = 1;
+	self.wantswelcomemessage = 1;
 
 	if(g_arena)
 	{
@@ -1280,6 +1283,7 @@
 		msg_entity = self;
 		WriteByte(MSG_ONE, SVC_SETVIEW);
 		WriteEntity(MSG_ONE, self.enemy);
+		self.wantswelcomemessage = 1;
 	 	//stuffcmd(self, "set viewsize $tmpviewsize \n");
 		SpectateUpdate();
 		return 1;
@@ -1569,7 +1573,6 @@
 			IntermissionThink ();	// otherwise a button could be missed between
 		return;
 	} else if(self.classname == "observer") {
-
 		if (self.flags & FL_JUMPRELEASED) {
 			if (self.button2 && self.version == cvar("gameversion")) {
 				self.welcomemessage_time = 0;
@@ -1588,7 +1591,10 @@
 				self.flags = self.flags | FL_JUMPRELEASED;
         		}
 		}
-		PrintWelcomeMessage(self);
+		if(self.button4)
+			self.wantswelcomemessage = 0;
+		if(self.wantswelcomemessage)
+			PrintWelcomeMessage(self);
 	} else if(self.classname == "spectator") {
 		if (self.flags & FL_JUMPRELEASED) {
 			if (self.button2 && self.version == cvar("gameversion")) {
@@ -1618,7 +1624,10 @@
 				self.flags = self.flags | FL_JUMPRELEASED;
         		}
 		}
-		PrintWelcomeMessage(self);
+		if(self.button4)
+			self.wantswelcomemessage = 0;
+		if(self.wantswelcomemessage)
+			PrintWelcomeMessage(self);
 		self.flags = self.flags | FL_CLIENT | FL_NOTARGET;
 	}
 }




More information about the nexuiz-commits mailing list