X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fjumppads.qc;h=ffe3d4ee8ea42ab72b42cf5d95c0d891a81b4093;hp=cbb2f03279d859bb79b84efd52803ebd771412f3;hb=7666560c6a475aefe6b55ff74a20444f328e0093;hpb=490a31934aa67cc7de5299a4d3f625d5271f8583

diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index cbb2f0327..ffe3d4ee8 100644
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -129,135 +129,130 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
 	return sdir * vs + '0 0 1' * vz;
 }
 
-void trigger_push_touch(entity this)
+void trigger_push_touch(entity this, entity toucher)
 {
 	if (this.active == ACTIVE_NOT)
 		return;
 
-	if (!isPushable(other))
+	if (!isPushable(toucher))
 		return;
 
 	if(this.team)
-		if(((this.spawnflags & 4) == 0) == (DIFF_TEAM(this, other)))
+		if(((this.spawnflags & 4) == 0) == (DIFF_TEAM(this, toucher)))
 			return;
 
-	EXACTTRIGGER_TOUCH;
+	EXACTTRIGGER_TOUCH(this, toucher);
 
 	if(this.enemy)
 	{
-		other.velocity = trigger_push_calculatevelocity(other.origin, this.enemy, this.height);
-		other.move_velocity = other.velocity;
+		toucher.velocity = trigger_push_calculatevelocity(toucher.origin, this.enemy, this.height);
 	}
-	else if(this.target)
+	else if(this.target && this.target != "")
 	{
 		entity e;
 		RandomSelection_Init();
-		for(e = world; (e = find(e, targetname, this.target)); )
+		for(e = NULL; (e = find(e, targetname, this.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, this.height);
-		other.move_velocity = other.velocity;
+		toucher.velocity = trigger_push_calculatevelocity(toucher.origin, RandomSelection_chosen_ent, this.height);
 	}
 	else
 	{
-		other.velocity = this.movedir;
-		other.move_velocity = other.velocity;
+		toucher.velocity = this.movedir;
 	}
 
-#ifdef SVQC
-	UNSET_ONGROUND(other);
-#elif defined(CSQC)
-	other.move_flags &= ~FL_ONGROUND;
+	UNSET_ONGROUND(toucher);
 
-	if (other.flags & FL_PROJECTILE)
+#ifdef CSQC
+	if (toucher.flags & FL_PROJECTILE)
 	{
-		other.move_angles = vectoangles (other.move_velocity);
-		switch(other.move_movetype)
+		toucher.angles = vectoangles (toucher.velocity);
+		switch(toucher.move_movetype)
 		{
 			case MOVETYPE_FLY:
-				other.move_movetype = MOVETYPE_TOSS;
-				other.gravity = 1;
+				toucher.move_movetype = MOVETYPE_TOSS;
+				toucher.gravity = 1;
 				break;
 			case MOVETYPE_BOUNCEMISSILE:
-				other.move_movetype = MOVETYPE_BOUNCE;
-				other.gravity = 1;
+				toucher.move_movetype = MOVETYPE_BOUNCE;
+				toucher.gravity = 1;
 				break;
 		}
 	}
 #endif
 
 #ifdef SVQC
-	if (IS_PLAYER(other))
+	if (IS_PLAYER(toucher))
 	{
 		// reset tracking of oldvelocity for impact damage (sudden velocity changes)
-		other.oldvelocity = other.velocity;
+		toucher.oldvelocity = toucher.velocity;
 
 		if(this.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
 		{
 			// flash when activated
-			Send_Effect(EFFECT_JUMPPAD, other.origin, other.velocity, 1);
-			_sound (other, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM);
+			Send_Effect(EFFECT_JUMPPAD, toucher.origin, toucher.velocity, 1);
+			_sound (toucher, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM);
 			this.pushltime = time + 0.2;
 		}
-		if(IS_REAL_CLIENT(other) || IS_BOT_CLIENT(other))
+		if(IS_REAL_CLIENT(toucher) || IS_BOT_CLIENT(toucher))
 		{
 			bool found = false;
-			for(int i = 0; i < other.jumppadcount && i < NUM_JUMPPADSUSED; ++i)
-				if(other.(jumppadsused[i]) == this)
+			for(int i = 0; i < toucher.jumppadcount && i < NUM_JUMPPADSUSED; ++i)
+				if(toucher.(jumppadsused[i]) == this)
 					found = true;
 			if(!found)
 			{
-				other.(jumppadsused[other.jumppadcount % NUM_JUMPPADSUSED]) = this;
-				other.jumppadcount = other.jumppadcount + 1;
+				toucher.(jumppadsused[toucher.jumppadcount % NUM_JUMPPADSUSED]) = this;
+				toucher.jumppadcount = toucher.jumppadcount + 1;
 			}
 
-			if(IS_REAL_CLIENT(other))
+			if(IS_REAL_CLIENT(toucher))
 			{
 				if(this.message)
-					centerprint(other, this.message);
+					centerprint(toucher, this.message);
 			}
 			else
-				other.lastteleporttime = time;
+				toucher.lastteleporttime = time;
 
-			if (!IS_DEAD(other))
-				animdecide_setaction(other, ANIMACTION_JUMP, true);
+			if (!IS_DEAD(toucher))
+				animdecide_setaction(toucher, ANIMACTION_JUMP, true);
 		}
 		else
-			other.jumppadcount = true;
+			toucher.jumppadcount = true;
 
 		// reset tracking of who pushed you into a hazard (for kill credit)
-		other.pushltime = 0;
-		other.istypefrag = 0;
+		toucher.pushltime = 0;
+		toucher.istypefrag = 0;
 	}
 
 	if(this.enemy.target)
-		SUB_UseTargets(this.enemy, other, other); // TODO: do we need other as trigger too?
+		SUB_UseTargets(this.enemy, toucher, toucher); // TODO: do we need toucher as trigger too?
 
-	if (other.flags & FL_PROJECTILE)
+	if (toucher.flags & FL_PROJECTILE)
 	{
-		other.angles = vectoangles (other.velocity);
-		switch(other.movetype)
+		toucher.angles = vectoangles (toucher.velocity);
+		switch(toucher.movetype)
 		{
 			case MOVETYPE_FLY:
-				other.movetype = MOVETYPE_TOSS;
-				other.gravity = 1;
+				toucher.movetype = MOVETYPE_TOSS;
+				toucher.gravity = 1;
 				break;
 			case MOVETYPE_BOUNCEMISSILE:
-				other.movetype = MOVETYPE_BOUNCE;
-				other.gravity = 1;
+				toucher.movetype = MOVETYPE_BOUNCE;
+				toucher.gravity = 1;
 				break;
 		}
-		UpdateCSQCProjectile(other);
+		UpdateCSQCProjectile(toucher);
 	}
 
-	/*if (other.flags & FL_ITEM)
+	/*if (toucher.flags & FL_ITEM)
 	{
-		ItemUpdate(other);
-		other.SendFlags |= ISF_DROP;
+		ItemUpdate(toucher);
+		toucher.SendFlags |= ISF_DROP;
 	}*/
 
 	if (this.spawnflags & PUSH_ONCE)
@@ -270,7 +265,7 @@ void trigger_push_touch(entity this)
 }
 
 #ifdef SVQC
-void trigger_push_link();
+void trigger_push_link(entity this);
 void trigger_push_updatelink(entity this);
 #endif
 void trigger_push_findtarget(entity this)
@@ -285,7 +280,7 @@ void trigger_push_findtarget(entity this)
 	if (this.target)
 	{
 		float n = 0;
-		for(t = world; (t = find(t, targetname, this.target)); )
+		for(t = NULL; (t = find(t, targetname, this.target)); )
 		{
 			++n;
 #ifdef SVQC
@@ -304,19 +299,19 @@ void trigger_push_findtarget(entity this)
 		{
 			// no dest!
 #ifdef SVQC
-			objerror ("Jumppad with nonexistant target");
+			objerror (this, "Jumppad with nonexistant target");
 #endif
 			return;
 		}
 		else if(n == 1)
 		{
 			// exactly one dest - bots love that
-			this.enemy = find(world, targetname, this.target);
+			this.enemy = find(NULL, targetname, this.target);
 		}
 		else
 		{
 			// have to use random selection every single time
-			this.enemy = world;
+			this.enemy = NULL;
 		}
 	}
 #ifdef SVQC
@@ -331,7 +326,7 @@ void trigger_push_findtarget(entity this)
 		remove(e);
 	}
 
-	trigger_push_link();
+	trigger_push_link(this);
 	defer(this, 0.1, trigger_push_updatelink);
 #endif
 }
@@ -346,6 +341,10 @@ float trigger_push_send(entity this, entity to, float sf)
 	WriteByte(MSG_ENTITY, this.active);
 	WriteCoord(MSG_ENTITY, this.height);
 
+	WriteCoord(MSG_ENTITY, this.movedir_x);
+	WriteCoord(MSG_ENTITY, this.movedir_y);
+	WriteCoord(MSG_ENTITY, this.movedir_z);
+
 	trigger_common_write(this, true);
 
 	return true;
@@ -356,9 +355,8 @@ void trigger_push_updatelink(entity this)
 	this.SendFlags |= 1;
 }
 
-void trigger_push_link()
+void trigger_push_link(entity this)
 {
-    SELFPARAM();
 	trigger_link(this, trigger_push_send);
 }
 
@@ -443,6 +441,10 @@ NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, bool isnew)
 	this.active = ReadByte();
 	this.height = ReadCoord();
 
+	this.movedir_x = ReadCoord();
+	this.movedir_y = ReadCoord();
+	this.movedir_z = ReadCoord();
+
 	trigger_common_read(this, true);
 
 	this.entremove = trigger_remove_generic;