X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_triggers.qc;h=4a66f229380ea9c505962ae4e5aa0abe9674d171;hb=d6b7cef4bca98370c1305bf0531d1e83445cf697;hp=d97413f10efb94ff15770a6faf4b5af981d0aeb0;hpb=98496b8f7cbb74f30232f5c52bb38158623bb597;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index d97413f10..4a66f2293 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -416,6 +416,10 @@ void trigger_hurt_touch()
 	if (self.active != ACTIVE_ACTIVE) 
 		return;
 
+	if(self.team)
+		if((self.spawnflags & 4 == 0) == (self.team != other.team))
+			return;
+
 	// only do the EXACTTRIGGER_TOUCH checks when really needed (saves some cpu)
 	if (other.iscreature)
 	{
@@ -1012,6 +1016,8 @@ void misc_laser_think()
 {
 	vector o;
 	entity oldself;
+	entity hitent;
+	vector hitloc;
 
 	self.nextthink = time;
 
@@ -1032,20 +1038,18 @@ void misc_laser_think()
 		o = self.origin + v_forward * 32768;
 	}
 
-	if(self.dmg)
+	if(self.dmg || self.enemy.target != "")
 	{
-		if(self.dmg < 0)
-			FireRailgunBullet(self.origin, o, 100000, 0, 0, 0, 0, 0, DEATH_HURTTRIGGER);
-		else
-			FireRailgunBullet(self.origin, o, self.dmg * frametime, 0, 0, 0, 0, 0, DEATH_HURTTRIGGER);
+		traceline(self.origin, o, MOVE_NORMAL, self);
 	}
+	hitent = trace_ent;
+	hitloc = trace_endpos;
 
 	if(self.enemy.target != "") // DETECTOR laser
 	{
-		traceline(self.origin, o, MOVE_NORMAL, self);
 		if(trace_ent.iscreature)
 		{
-			self.pusher = trace_ent;
+			self.pusher = hitent;
 			if(!self.count)
 			{
 				self.count = 1;
@@ -1071,6 +1075,15 @@ void misc_laser_think()
 			}
 		}
 	}
+
+	if(self.dmg)
+	{
+		if(self.team)
+			if((self.spawnflags & 8 == 0) == (self.team != hitent.team))
+				return;
+		if(hitent.takedamage)
+			Damage(hitent, self, self, ((self.dmg < 0) ? 100000 : (self.dmg * frametime)), DEATH_HURTTRIGGER, hitloc, '0 0 0');
+	}
 }
 
 float laser_SendEntity(entity to, float fl)
@@ -1188,6 +1201,8 @@ void spawnfunc_misc_laser()
 		self.scale = 1;
 	if(!self.modelscale)
 		self.modelscale = 1;
+	else if(self.modelscale < 0)
+		self.modelscale = 0;
 	self.think = misc_laser_think;
 	self.nextthink = time;
 	InitializeEntity(self, misc_laser_init, INITPRIO_FINDTARGET);