X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fhurt.qc;h=82199a39311ec56ee18d3acdb2e718818afdb0ed;hp=3a15a77ff4d4c3ff69fb1813c3d25886378684a6;hb=cf1edea8694548556934b5b05f526bc192f576cb;hpb=153e558088db2813f7f7dd5367244b5470f4d425

diff --git a/qcsrc/common/triggers/trigger/hurt.qc b/qcsrc/common/triggers/trigger/hurt.qc
index 3a15a77ff..82199a393 100644
--- a/qcsrc/common/triggers/trigger/hurt.qc
+++ b/qcsrc/common/triggers/trigger/hurt.qc
@@ -1,14 +1,14 @@
 #ifdef SVQC
-void trigger_hurt_use()
+void trigger_hurt_use(entity this, entity actor, entity trigger)
 {
-	if(IS_PLAYER(activator))
-		self.enemy = activator;
+	if(IS_PLAYER(actor))
+		this.enemy = actor;
 	else
-		self.enemy = world; // let's just destroy it, if taking over is too much work
+		this.enemy = world; // let's just destroy it, if taking over is too much work
 }
 
 .float triggerhurttime;
-void trigger_hurt_touch()
+void trigger_hurt_touch(entity this)
 {
 	if (self.active != ACTIVE_ACTIVE)
 		return;
@@ -34,7 +34,7 @@ void trigger_hurt_touch()
 				self.enemy = world; // I still hate you all
 			}
 
-			Damage (other, self, own, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0');
+			Damage (other, self, own, self.dmg, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0');
 		}
 	}
 	else if(other.damagedbytriggers)
@@ -42,7 +42,7 @@ void trigger_hurt_touch()
 		if(other.takedamage)
 		{
 			EXACTTRIGGER_TOUCH;
-			Damage(other, self, self, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0');
+			Damage(other, self, self, self.dmg, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0');
 		}
 	}
 
@@ -57,26 +57,26 @@ defalt dmg = 5
 .entity trigger_hurt_next;
 entity trigger_hurt_last;
 entity trigger_hurt_first;
-void spawnfunc_trigger_hurt()
+spawnfunc(trigger_hurt)
 {
 	EXACTTRIGGER_INIT;
-	self.active = ACTIVE_ACTIVE;
-	self.touch = trigger_hurt_touch;
-	self.use = trigger_hurt_use;
-	self.enemy = world; // I hate you all
-	if (!self.dmg)
-		self.dmg = 1000;
-	if (self.message == "")
-		self.message = "was in the wrong place";
-	if (self.message2 == "")
-		self.message2 = "was thrown into a world of hurt by";
-	// self.message = "someone like %s always gets wrongplaced";
+	this.active = ACTIVE_ACTIVE;
+	settouch(this, trigger_hurt_touch);
+	this.use = trigger_hurt_use;
+	this.enemy = world; // I hate you all
+	if (!this.dmg)
+		this.dmg = 1000;
+	if (this.message == "")
+		this.message = "was in the wrong place";
+	if (this.message2 == "")
+		this.message2 = "was thrown into a world of hurt by";
+	// this.message = "someone like %s always gets wrongplaced";
 
 	if(!trigger_hurt_first)
-		trigger_hurt_first = self;
+		trigger_hurt_first = this;
 	if(trigger_hurt_last)
-		trigger_hurt_last.trigger_hurt_next = self;
-	trigger_hurt_last = self;
+		trigger_hurt_last.trigger_hurt_next = this;
+	trigger_hurt_last = this;
 }
 
 float tracebox_hits_trigger_hurt(vector start, vector mi, vector ma, vector end)