X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fmagicear.qc;h=3287210409c8cd65b73cbd378e02920f5c7a70e4;hb=cf1edea8694548556934b5b05f526bc192f576cb;hp=c20514e1a61f8e9cff3b0355c77bee16d10fce4f;hpb=03f978544a8b13a18cef1c7cc3dbcaba1c3aee4c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/trigger/magicear.qc b/qcsrc/common/triggers/trigger/magicear.qc
index c20514e1a..328721040 100644
--- a/qcsrc/common/triggers/trigger/magicear.qc
+++ b/qcsrc/common/triggers/trigger/magicear.qc
@@ -9,7 +9,7 @@ string trigger_magicear_processmessage(entity ear, entity source, float teamsay,
 
 	magicear_matched = false;
 
-	dotrigger = ((IS_PLAYER(source)) && (source.deadflag == DEAD_NO) && ((ear.radius == 0) || (vlen(source.origin - ear.origin) <= ear.radius)));
+	dotrigger = ((IS_PLAYER(source)) && (!IS_DEAD(source)) && ((ear.radius == 0) || (vdist(source.origin - ear.origin, <=, ear.radius))));
 	domatch = ((ear.spawnflags & 32) || dotrigger);
 
 	if (!domatch)
@@ -28,13 +28,10 @@ string trigger_magicear_processmessage(entity ear, entity source, float teamsay,
 
 		if(dotrigger)
 		{
-			activator = source;
-			setself(ear);
 			savemessage = self.message;
 			self.message = string_null;
-			SUB_UseTargets();
+			SUB_UseTargets(ear, source, NULL);
 			self.message = savemessage;
-			setself(this);
 		}
 
 		if(ear.netname != "")
@@ -118,13 +115,10 @@ string trigger_magicear_processmessage(entity ear, entity source, float teamsay,
 
 	if(dotrigger)
 	{
-		activator = source;
-		setself(ear);
 		savemessage = self.message;
 		self.message = string_null;
-		SUB_UseTargets();
+		SUB_UseTargets(ear, source, NULL);
 		self.message = savemessage;
-		setself(this);
 	}
 
 	if(ear.spawnflags & 16)
@@ -164,8 +158,8 @@ string trigger_magicear_processmessage_forallears(entity source, float teamsay,
 
 spawnfunc(trigger_magicear)
 {
-	self.enemy = magicears;
-	magicears = self;
+	this.enemy = magicears;
+	magicears = this;
 
 	// actually handled in "say" processing
 	// spawnflags:
@@ -196,6 +190,6 @@ spawnfunc(trigger_magicear)
 	// movedir:
 	//   for spawnflags 256, defines 'instrument+1 mintempo maxtempo' (zero component doesn't matter)
 
-	self.movedir_x -= 1; // map to tuba instrument numbers
+	this.movedir_x -= 1; // map to tuba instrument numbers
 }
 #endif