r1837 - in branches/nexuiz-2.0/data: gfx qcsrc/server

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2006-08-21 15:14:26 -0400 (Mon, 21 Aug 2006)
New Revision: 1837

Added:
   branches/nexuiz-2.0/data/gfx/sb_flag_blue_carrying.tga
   branches/nexuiz-2.0/data/gfx/sb_flag_blue_lost.tga
   branches/nexuiz-2.0/data/gfx/sb_flag_blue_taken.tga
   branches/nexuiz-2.0/data/gfx/sb_flag_red_carrying.tga
   branches/nexuiz-2.0/data/gfx/sb_flag_red_lost.tga
   branches/nexuiz-2.0/data/gfx/sb_flag_red_taken.tga
Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
   branches/nexuiz-2.0/data/qcsrc/server/ctf.qc
Log:
ctf flag icon changes from trunk


Copied: branches/nexuiz-2.0/data/gfx/sb_flag_blue_carrying.tga (from rev 1836, trunk/data/gfx/sb_flag_blue_carrying.tga)

Copied: branches/nexuiz-2.0/data/gfx/sb_flag_blue_lost.tga (from rev 1836, trunk/data/gfx/sb_flag_blue_lost.tga)

Copied: branches/nexuiz-2.0/data/gfx/sb_flag_blue_taken.tga (from rev 1836, trunk/data/gfx/sb_flag_blue_taken.tga)

Copied: branches/nexuiz-2.0/data/gfx/sb_flag_red_carrying.tga (from rev 1836, trunk/data/gfx/sb_flag_red_carrying.tga)

Copied: branches/nexuiz-2.0/data/gfx/sb_flag_red_lost.tga (from rev 1836, trunk/data/gfx/sb_flag_red_lost.tga)

Copied: branches/nexuiz-2.0/data/gfx/sb_flag_red_taken.tga (from rev 1836, trunk/data/gfx/sb_flag_red_taken.tga)

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2006-08-21 19:09:28 UTC (rev 1836)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2006-08-21 19:14:26 UTC (rev 1837)
@@ -1289,6 +1289,7 @@
 Called every frame for each client before the physics are run
 =============
 */
+void() ctf_setstatus;
 void PlayerPreThink (void)
 {
 	if(self.classname == "player") {
@@ -1467,6 +1468,8 @@
 		if (cvar("g_minstagib"))
 			minstagib_ammocheck();
 
+		ctf_setstatus();
+
 		//self.angles_y=self.v_angle_y + 90;   // temp
 
 		if (self.waterlevel == 2)

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2006-08-21 19:09:28 UTC (rev 1836)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2006-08-21 19:14:26 UTC (rev 1837)
@@ -173,6 +173,13 @@
 float	IT_KEY1					= 131072;
 float	IT_KEY2					= 262144;
 
+float	IT_RED_FLAG_TAKEN			= 32768;
+float	IT_RED_FLAG_LOST			= 65536;
+float	IT_RED_FLAG_CARRING			= 98304;
+float	IT_BLUE_FLAG_TAKEN			= 131072;
+float	IT_BLUE_FLAG_LOST			= 262144;
+float	IT_BLUE_FLAG_CARRING			= 393216;
+
 float	IT_5HP					= 524288;
 float	IT_25HP					= 1048576;
 float	IT_ARMOR_SHARD				= 2097152;

Modified: branches/nexuiz-2.0/data/qcsrc/server/ctf.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/ctf.qc	2006-08-21 19:09:28 UTC (rev 1836)
+++ branches/nexuiz-2.0/data/qcsrc/server/ctf.qc	2006-08-21 19:14:26 UTC (rev 1837)
@@ -567,3 +567,37 @@
 	e.nextthink = time + 0.1;
 };
 
+void(entity flag) ctf_setstatus2 =
+{
+	if (flag) {
+		local float shift;
+		if (flag.team == 5) shift = IT_RED_FLAG_TAKEN;
+		else if (flag.team == 14) shift = IT_BLUE_FLAG_TAKEN;
+		else shift = 0;
+
+		local float status;
+		if (flag.cnt ==	FLAG_CARRY)
+			if (flag.owner == self) status = 3;
+			else status = 1;
+		else if (flag.cnt == FLAG_DROPPED) status = 2;
+		else status = 0;
+
+		self.items = self.items | (shift * status);
+	}
+};
+
+void() ctf_setstatus =
+{
+	self.items = self.items - (self.items & IT_RED_FLAG_TAKEN);
+	self.items = self.items - (self.items & IT_RED_FLAG_LOST);
+	self.items = self.items - (self.items & IT_BLUE_FLAG_TAKEN);
+	self.items = self.items - (self.items & IT_BLUE_FLAG_LOST);
+
+	if (cvar("g_ctf")) {
+		local entity flag;
+		flag = find(flag, classname, "item_flag_team1");
+		ctf_setstatus2(flag);
+		flag = find(flag, classname, "item_flag_team2");
+		ctf_setstatus2(flag);
+	}
+};