r4786 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-18 18:00:50 -0400 (Sat, 18 Oct 2008)
New Revision: 4786

Modified:
   trunk/data/qcsrc/server/ctf.qc
Log:
switch icons in reverse ctf ;)


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2008-10-18 21:56:01 UTC (rev 4785)
+++ trunk/data/qcsrc/server/ctf.qc	2008-10-18 22:00:50 UTC (rev 4786)
@@ -777,9 +777,9 @@
 
 		for (flag = ctf_worldflaglist; flag; flag = flag.ctf_worldflagnext) if(flag.cnt != FLAG_BASE)
 		{
-			if(flag.team == COLOR_TEAM1)
+			if(flag.items & IT_KEY2) // blue
 				++redflags;
-			else if(flag.team == COLOR_TEAM2)
+			else if(flag.items & IT_KEY1) // red
 				++blueflags;
 		}
 
@@ -791,12 +791,12 @@
 
 		for (flag = ctf_worldflaglist; flag; flag = flag.ctf_worldflagnext) if(flag.cnt != FLAG_BASE)
 		{
-			if(flag.team == COLOR_TEAM1)
+			if(flag.items & IT_KEY2) // blue
 			{
 				if(--redflags == -1) // happens exactly once (redflags is in 0..count-1, and will --'ed count times)
 					ctf_setstatus2(flag, IT_RED_FLAG_TAKEN);
 			}
-			else if(flag.team == COLOR_TEAM2)
+			else if(flag.items & IT_KEY1) // red
 			{
 				if(--blueflags == -1) // happens exactly once
 					ctf_setstatus2(flag, IT_BLUE_FLAG_TAKEN);