X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Flaser.qc;h=a91e13b01991e52517af210079478858eb0faae7;hb=0909b720b2bc741660ede9041c301555d9661e45;hp=6703b1b11f82ad1b96d7e387d33b36d2b44b7996;hpb=cc7d9b829f2b8e1eb1bb04ef30541fbc7b688e2d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 6703b1b11..a91e13b01 100644
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -22,14 +22,29 @@ void Draw_Laser()
 	InterpolateOrigin_Do();
 	if(self.count & 0x80)
 	{
-		traceline(self.origin, self.velocity, 0, self);
+		if(self.count & 0x10)
+		{
+			trace_endpos = self.velocity,
+			trace_dphitq3surfaceflags = 0;
+		}
+		else
+			traceline(self.origin, self.velocity, 0, self);
 	}
 	else
 	{
-		makevectors(self.angles);
-		traceline(self.origin, self.origin + v_forward * 32768, 0, self);
-		if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)
+		if(self.count & 0x10)
+		{
+			makevectors(self.angles);
 			trace_endpos = self.origin + v_forward * 1048576;
+			trace_dphitq3surfaceflags = Q3SURFACEFLAG_SKY;
+		}
+		else
+		{
+			makevectors(self.angles);
+			traceline(self.origin, self.origin + v_forward * 32768, 0, self);
+			if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)
+				trace_endpos = self.origin + v_forward * 1048576;
+		}
 	}
 	if(self.scale != 0)
 	{
@@ -47,7 +62,7 @@ void Draw_Laser()
 		if(self.cnt >= 0)
 			pointparticles(self.cnt, trace_endpos, trace_plane_normal, drawframetime * 1000);
 		if(self.colormod != '0 0 0' && self.modelscale != 0)
-			R_AddDynamicLight(trace_endpos + trace_plane_normal * 1, self.modelscale, self.colormod * 5);
+			adddynamiclight(trace_endpos + trace_plane_normal * 1, self.modelscale, self.colormod * 5);
 	}
 }
 
@@ -58,7 +73,7 @@ void Ent_Laser()
 
 	// 30 bytes, or 13 bytes for just moving
 	f = ReadByte();
-	self.count = (f & 0xE0);
+	self.count = (f & 0xF0);
 
 	if(self.count & 0x80)
 		self.iflags = IFLAG_VELOCITY;
@@ -87,7 +102,10 @@ void Ent_Laser()
 			self.scale *= ReadByte() / 16.0; // beam radius
 			self.modelscale *= ReadByte() / 16.0; // dlight radius
 		}
-		self.cnt = ReadShort() - 1; // effect number
+		if((f & 0x80) || !(f & 0x10))
+			self.cnt = ReadShort() - 1; // effect number
+		else
+			self.cnt = 0;
 	}
 	if(f & 2)
 	{