r1814 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Aug 11 12:43:10 EDT 2006


Author: div0
Date: 2006-08-11 12:43:09 -0400 (Fri, 11 Aug 2006)
New Revision: 1814

Modified:
   trunk/data/qcsrc/server/cl_impulse.qc
   trunk/data/qcsrc/server/clientcommands.qc
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
"impulse 18" now shows the player you point to


Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc	2006-08-10 16:28:30 UTC (rev 1813)
+++ trunk/data/qcsrc/server/cl_impulse.qc	2006-08-11 16:43:09 UTC (rev 1814)
@@ -113,6 +113,23 @@
 			&& !cvar("g_rocketarena") && !cvar("g_lms") && cvar("g_pickup_items") && !cvar("g_nixnex"))
 			W_ThrowWeapon(self.velocity * 0.5 + v_forward * 750, '0 0 0', TRUE);
 	}
+	else if (imp == 18)
+	{
+		if(self.cursor_trace_ent.classname == "player")
+		{
+			string t;
+			string h;
+			t = "^3";
+			h = "";
+			if(teams_matter)
+			{
+				t = Team_ColorCode(self.cursor_trace_ent.team);
+				if(self.team == self.cursor_trace_ent.team)
+					h = strcat(" (", ftos(self.cursor_trace_ent.health), "% health)");
+			}
+			centermsg_set(CENTERMSG_KILL, strcat(t, self.cursor_trace_ent.netname, h));
+		}
+	}
 	else
 	{
 		if (cvar("sv_cheats"))

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2006-08-10 16:28:30 UTC (rev 1813)
+++ trunk/data/qcsrc/server/clientcommands.qc	2006-08-11 16:43:09 UTC (rev 1814)
@@ -12,16 +12,7 @@
 	if(msgin == "")
 		return;
 
-	if(source.team == COLOR_TEAM1)
-		colorstr = "^1";
-	else if(source.team == COLOR_TEAM2)
-		colorstr = "^4";
-	else if(source.team == COLOR_TEAM3)
-		colorstr = "^6";
-	else if(source.team == COLOR_TEAM4)
-		colorstr = "^3";
-	else
-		colorstr = "^7";
+	colorstr = Team_ColorCode(source.team);
 
 	if(!teams_matter)
 		teamsay = FALSE;

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2006-08-10 16:28:30 UTC (rev 1813)
+++ trunk/data/qcsrc/server/constants.qh	2006-08-11 16:43:09 UTC (rev 1814)
@@ -210,3 +210,8 @@
 float FLAG_DROPPED = 3;
 
 float MAX_SHOT_DISTANCE = 32768;
+
+float COLOR_TEAM1	= 5;  // red
+float COLOR_TEAM2	= 14; // blue
+float COLOR_TEAM3	= 10; // pink
+float COLOR_TEAM4	= 13; // yellow

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2006-08-10 16:28:30 UTC (rev 1813)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2006-08-11 16:43:09 UTC (rev 1814)
@@ -475,3 +475,16 @@
 		error(strcat("There were ", ftos(f), " frags left. BAD!"));
 }
 
+string Team_ColorCode(float team)
+{
+	if(team == COLOR_TEAM1)
+		return "^1";
+	else if(team == COLOR_TEAM2)
+		return "^4";
+	else if(team == COLOR_TEAM3)
+		return "^6";
+	else if(team == COLOR_TEAM4)
+		return "^3";
+	else
+		return "^7";
+}

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2006-08-10 16:28:30 UTC (rev 1813)
+++ trunk/data/qcsrc/server/teamplay.qc	2006-08-11 16:43:09 UTC (rev 1814)
@@ -1,9 +1,3 @@
-float COLOR_TEAM1	= 5;  // red
-float COLOR_TEAM2	= 14; // blue
-float COLOR_TEAM3	= 10; // pink
-float COLOR_TEAM4	= 13; // yellow
-
-
 float GAME_DEATHMATCH		= 1;
 float GAME_TEAM_DEATHMATCH	= 2;
 float GAME_DOMINATION		= 3;




More information about the nexuiz-commits mailing list