From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 Aug 2012 01:15:51 +0000 (-0400)
Subject: Working on adding warpzone support to passing flags... still doesn't work
X-Git-Tag: xonotic-v0.7.0~240^2~71
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ee6daad78cc8996486be44d836a8e8ca17351a3;p=xonotic%2Fxonotic-data.pk3dir.git

Working on adding warpzone support to passing flags... still doesn't work
properly... ARGH
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 573e7610e..31b19f46d 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -272,7 +272,7 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype)
 	{
 		case DROP_PASS:
 		{
-			vector targ_origin = (0.5 * (reciever.absmin + reciever.absmax));
+			vector targ_origin = WarpZone_RefSys_TransformOrigin(player, reciever, (0.5 * (reciever.absmin + reciever.absmax)));
 			flag.velocity = (normalize(targ_origin - player.origin) * autocvar_g_ctf_pass_velocity);
 			break;
 		}
@@ -697,8 +697,39 @@ void ctf_FlagThink()
 		
 		case FLAG_PASSING: // todo make work with warpzones
 		{			
+			/*vector targ_origin = ((self.pass_target.absmin + self.pass_target.absmax) * 0.5);
+			vector old_targ_origin = targ_origin;
+			targ_origin = WarpZone_RefSys_TransformOrigin(self.pass_sender, self.pass_target, targ_origin);
+
+			print("old: ", vtos(old_targ_origin), ", transformed: ", vtos(targ_origin), ".\n");
+			
+			WarpZone_TraceLine(self.origin, targ_origin, MOVE_NOMONSTERS, self);
+			
+			te_customflash(self.origin, 40,  2, '1 1 1');
+			te_customflash(targ_origin, 200, 2, '15 0 0');
+			
+			if((self.pass_target.deadflag != DEAD_NO)
+				|| (vlen(self.origin - targ_origin) > autocvar_g_ctf_pass_radius)
+				|| ((trace_fraction < 1) && (trace_ent != self.pass_target))
+				|| (time > self.ctf_droptime + autocvar_g_ctf_pass_timelimit))
+			{
+				ctf_Handle_Drop(self, world, DROP_PASS);
+			}
+			else // still a viable target, go for it
+			{
+				vector desired_direction = normalize(targ_origin - self.origin);
+				vector current_direction = normalize(self.velocity);
+				
+				self.velocity = (normalize(current_direction + (desired_direction * autocvar_g_ctf_pass_turnrate)) * autocvar_g_ctf_pass_velocity); 
+			}
+			return;*/
+
 			vector targ_origin = ((self.pass_target.absmin + self.pass_target.absmax) * 0.5);
-			traceline(self.origin, targ_origin, MOVE_NOMONSTERS, self);
+			vector old_targ_origin = targ_origin;
+			targ_origin = WarpZone_RefSys_TransformOrigin(self.pass_sender, self.pass_target, targ_origin);
+			WarpZone_TraceLine(self.origin, targ_origin, MOVE_NOMONSTERS, self);
+
+			print("old: ", vtos(old_targ_origin), ", transformed: ", vtos(targ_origin), ".\n");
 			
 			if((self.pass_target.deadflag != DEAD_NO)
 				|| (vlen(self.origin - targ_origin) > autocvar_g_ctf_pass_radius)
@@ -712,6 +743,7 @@ void ctf_FlagThink()
 				vector desired_direction = normalize(targ_origin - self.origin);
 				vector current_direction = normalize(self.velocity);
 				
+				// self.velocity = (normalize(current_direction + (desired_direction * autocvar_g_ctf_pass_turnrate)) * autocvar_g_ctf_pass_velocity);
 				self.velocity = (normalize(current_direction + (desired_direction * autocvar_g_ctf_pass_turnrate)) * autocvar_g_ctf_pass_velocity); 
 			}
 			return;
@@ -1074,7 +1106,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)
 		if(autocvar_g_ctf_pass)
 		{
 			entity head, closest_target;
-			head = findradius(player.origin, autocvar_g_ctf_pass_radius);
+			head = WarpZone_FindRadius(player.origin, autocvar_g_ctf_pass_radius, TRUE);
 			
 			while(head) // find the closest acceptable target to pass to
 			{
@@ -1082,29 +1114,29 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)
 				if(head != player && !IsDifferentTeam(head, player))
 				if(!head.speedrunning && (!head.vehicle || autocvar_g_ctf_allow_vehicle_touch))
 				{
-					traceline(player.origin, head.origin, MOVE_NOMONSTERS, player);
-					if not((trace_fraction < 1) && (trace_ent != head))
-					{
-						if(autocvar_g_ctf_pass_request && !player.flagcarried && head.flagcarried) 
-						{ 
-							if(clienttype(head) == CLIENTTYPE_BOT)
-							{
-								centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); 
-								ctf_Handle_Throw(head, player, DROP_PASS);
-							}
-							else
-							{
-								centerprint(head, strcat(player.netname, " requests you to pass the ", head.flagcarried.netname)); 
-								centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); 
-							}
-							player.throw_antispam = time + autocvar_g_ctf_pass_wait; 
-							return 0; 
+					if(autocvar_g_ctf_pass_request && !player.flagcarried && head.flagcarried) 
+					{ 
+						if(clienttype(head) == CLIENTTYPE_BOT)
+						{
+							centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); 
+							ctf_Handle_Throw(head, player, DROP_PASS);
+						}
+						else
+						{
+							centerprint(head, strcat(player.netname, " requests you to pass the ", head.flagcarried.netname)); 
+							centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); 
 						}
-						else if(player.flagcarried)
+						player.throw_antispam = time + autocvar_g_ctf_pass_wait; 
+						return 0; 
+					}
+					else if(player.flagcarried)
+					{
+						if(closest_target)
 						{
-							if(closest_target) { if(vlen(player.origin - head.origin) < vlen(player.origin - closest_target.origin)) { closest_target = head; } }
-							else { closest_target = head; }
+							if(vlen(player.origin - WarpZone_RefSys_TransformOrigin(player, head, head.origin)) < vlen(player.origin - WarpZone_RefSys_TransformOrigin(player, head, closest_target.origin)))
+								{ closest_target = head; }
 						}
+						else { closest_target = head; }
 					}
 				}
 				head = head.chain;