From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 7 Aug 2011 15:27:09 +0000 (+0200)
Subject: allow multiple targets for jumppads too (random selection)
X-Git-Tag: xonotic-v0.5.0~148^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c79bf0dcbd930611045291eaf5695c06831dbec1;p=xonotic%2Fxonotic-data.pk3dir.git

allow multiple targets for jumppads too (random selection)
---

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 18dbef171..5302a9292 100644
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -127,6 +127,8 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
 
 void trigger_push_touch()
 {
+	vector move;
+
 	if (self.active == ACTIVE_NOT)
 		return;
 
@@ -139,13 +141,30 @@ void trigger_push_touch()
 
 	EXACTTRIGGER_TOUCH;
 
-	if(self.target)
-		self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
+	if(self.enemy)
+	{
+		other.velocity = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
+	}
+	else if(self.target)
+	{
+		entity e;
+		RandomSelection_Init();
+		for(e = world; (e = find(e, targetname, self.target)); )
+		{
+			if(e.cnt)
+				RandomSelection_Add(e, 0, string_null, e.cnt, 1);
+			else
+				RandomSelection_Add(e, 0, string_null, 1, 1);
+		}
+		other.velocity = trigger_push_calculatevelocity(other.origin, RandomSelection_chosen_ent, self.height);
+	}
+	else
+	{
+		other.velocity = self.movedir;
+	}
 
 	other.flags &~= FL_ONGROUND;
 
-	other.velocity = self.movedir;
-
 	if (other.classname == "player")
 	{
 		// reset tracking of oldvelocity for impact damage (sudden velocity changes)
@@ -237,31 +256,47 @@ void trigger_push_findtarget()
 
 	if (self.target)
 	{
-		// find the target
-		self.enemy = find(world, targetname, self.target);
-		if (!self.enemy)
+		float n;
+		n = 0;
+		for(e = world; (e = find(e, targetname, self.target)); )
 		{
-			objerror("trigger_push: target not found\n");
-			remove(self);
-			return;
+			++n;
+
+			trigger_push_calculatevelocity(org, self.enemy, self.height);
+			flighttime = trigger_push_calculatevelocity_flighttime;
+
+			if(e.movetype == MOVETYPE_NONE)
+				waypoint_spawnforteleporter(self, e.origin, flighttime);
 		}
 
-		self.movedir = trigger_push_calculatevelocity(org, self.enemy, self.height);
-		flighttime = trigger_push_calculatevelocity_flighttime;
+		if(n == 0)
+		{
+			// no dest!
+			objerror ("Jumppad with nonexistant target");
+			return;
+		}
+		else if(n == 1)
+		{
+			// exactly one dest - bots love that
+			self.enemy = find(e, targetname, self.target);
+		}
+		else
+		{
+			// have to use random selection every single time
+			self.enemy = world;
+		}
 	}
 	else
-		flighttime = 0;
-
-	// calculate the destination and spawn a teleporter spawnfunc_waypoint
-	e = spawn();
-	setorigin(e, org);
-	setsize(e, PL_MIN, PL_MAX);
-	e.velocity = self.movedir;
-	tracetoss(e, e);
-	self.dest = trace_endpos;
-	remove(e);
-
-	waypoint_spawnforteleporter(self, self.dest, flighttime);
+	{
+		e = spawn();
+		setorigin(e, org);
+		setsize(e, PL_MIN, PL_MAX);
+		e.velocity = self.movedir;
+		tracetoss(e, e);
+		self.dest = trace_endpos;
+		remove(e);
+		waypoint_spawnforteleporter(self, self.dest, vlen(self.dest - org) / vlen(self.movedir));
+	}
 };
 
 /*