X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fwarpzone%2Fserver.qc;h=ddaa41657907c285f919ccd3cad6f8f6dabf17d8;hb=1add7fc6b9e512dcfcfd3180505046449ac782cd;hp=2b860d6f4311283a905d8d48c760402513ba06e6;hpb=00f6072f2b0f269b2bc63a62ad900515646ca30d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 2b860d6f4..ddaa41657 100644
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -206,7 +206,7 @@ void WarpZone_Touch ()
 #endif
 		return;
 
-	if(WarpZoneLib_ExactTrigger_Touch())
+	if(WarpZoneLib_ExactTrigger_Touch(self, other))
 		return;
 
 #ifdef SVQC
@@ -241,21 +241,18 @@ void WarpZone_Touch ()
 	{
 #ifdef SVQC
 		string save1, save2;
-		activator = other;
 
 		save1 = this.target; this.target = string_null;
 		save2 = this.target3; this.target3 = string_null;
-		SUB_UseTargets();
+		SUB_UseTargets(this, other, other); // use other too?
 		if (!this.target) this.target = save1;
 		if (!this.target3) this.target3 = save2;
 
-		setself(this.enemy);
 		save1 = this.target; this.target = string_null;
 		save2 = this.target2; this.target2 = string_null;
-		SUB_UseTargets();
+		SUB_UseTargets(this.enemy, other, other); // use other too?
 		if (!this.target) this.target = save1;
 		if (!this.target2) this.target2 = save2;
-		setself(this);
 #endif
 	}
 	else
@@ -412,27 +409,19 @@ float WarpZone_CheckProjectileImpact(entity player)
 	player.velvec = player.warpzone_oldvelocity;
 	if(WarpZone_Teleport(wz, player, 0, 1))
 	{
-		entity oldself;
 		string save1, save2;
 
-		oldself = self;
-		self = wz;
-		other = player;
-		activator = player;
-
-		save1 = self.target; self.target = string_null;
-		save2 = self.target3; self.target3 = string_null;
-		SUB_UseTargets();
-		if (!self.target) self.target = save1;
-		if (!self.target3) self.target3 = save2;
-
-		self = self.enemy;
-		save1 = self.target; self.target = string_null;
-		save2 = self.target2; self.target2 = string_null;
-		SUB_UseTargets();
-		if (!self.target) self.target = save1;
-		if (!self.target2) self.target2 = save2;
-		self = oldself;
+		save1 = wz.target; wz.target = string_null;
+		save2 = wz.target3; wz.target3 = string_null;
+		SUB_UseTargets(wz, player, player);
+		if (!wz.target) wz.target = save1;
+		if (!wz.target3) wz.target3 = save2;
+
+		save1 = wz.enemy.target; wz.enemy.target = string_null;
+		save2 = wz.enemy.target2; wz.enemy.target2 = string_null;
+		SUB_UseTargets(wz.enemy, player, player);
+		if (!wz.enemy.target) wz.enemy.target = save1;
+		if (!wz.enemy.target2) wz.enemy.target2 = save2;
 	}
 	else
 	{
@@ -730,7 +719,7 @@ void WarpZone_InitStep_FinalizeTransform(entity this)
 
 	warpzone_warpzones_exist = 1;
 	WarpZone_SetUp(this, this.warpzone_origin, this.warpzone_angles, this.enemy.warpzone_origin, this.enemy.warpzone_angles);
-	this.touch = WarpZone_Touch;
+	settouch(this, WarpZone_Touch);
 	this.SendFlags = 0xFFFFFF;
 	if(this.spawnflags & 1)
 	{
@@ -772,7 +761,7 @@ spawnfunc(trigger_warpzone)
 		this.scale = 1;
 	string m;
 	m = this.model;
-	WarpZoneLib_ExactTrigger_Init();
+	WarpZoneLib_ExactTrigger_Init(this);
  	if(m != "")
  	{
  		precache_model(m);
@@ -849,7 +838,6 @@ void WarpZone_Think()
 
 void WarpZone_StartFrame()
 {
-	SELFPARAM();
 	if (!warpzone_initialized)
 	{
 		warpzone_initialized = true;
@@ -877,24 +865,23 @@ void WarpZone_StartFrame()
 
 			// warpzones
 			if (warpzone_warpzones_exist) {
-				setself(WarpZone_Find(it.origin + it.mins, it.origin + it.maxs));
-				if (self)
-				if (!WarpZoneLib_ExactTrigger_Touch())
-				if (WarpZone_PlaneDist(self, it.origin + it.view_ofs) <= 0)
-					WarpZone_Teleport(self, it, -1, 0); // NOT triggering targets by this!
+				entity e = WarpZone_Find(it.origin + it.mins, it.origin + it.maxs);
+				if (e)
+				if (!WarpZoneLib_ExactTrigger_Touch(e, other))
+				if (WarpZone_PlaneDist(e, it.origin + it.view_ofs) <= 0)
+					WarpZone_Teleport(e, it, -1, 0); // NOT triggering targets by this!
 			}
 
 			// teleporters
 			if(other.teleportable)
 			{
-				setself(Teleport_Find(it.origin + it.mins, it.origin + it.maxs));
-				if (self)
-				if (!WarpZoneLib_ExactTrigger_Touch())
-					Simple_TeleportPlayer(self, other); // NOT triggering targets by this!
+				entity ent = Teleport_Find(it.origin + it.mins, it.origin + it.maxs);
+				if (ent)
+				if (!WarpZoneLib_ExactTrigger_Touch(ent, other))
+					Simple_TeleportPlayer(ent, other); // NOT triggering targets by this!
 			}
 		}
 	});
-	setself(this);
 	other = oldother;
 }
 
@@ -906,8 +893,8 @@ bool visible_to_some_client(entity ent)
 	));
 	return false;
 }
-void trigger_warpzone_reconnect_use()
-{SELFPARAM();
+void trigger_warpzone_reconnect_use(entity this, entity actor, entity trigger)
+{
 	// NOTE: this matches for target, not targetname, but of course
 	// targetname must be set too on the other entities
 	for(entity e = warpzone_first; e; e = e.warpzone_next)