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

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 32119283e..a91e13b01 100644
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -34,6 +34,7 @@ void Draw_Laser()
 	{
 		if(self.count & 0x10)
 		{
+			makevectors(self.angles);
 			trace_endpos = self.origin + v_forward * 1048576;
 			trace_dphitq3surfaceflags = Q3SURFACEFLAG_SKY;
 		}
@@ -61,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);
 	}
 }
 
@@ -101,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)
 	{