Fix a bug with shotgun secondary where it would give up the swing before it actually...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / laser.qc

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 32119283e937833e4a10d2cd817c5a32b4299e8c..0880ddc4b26548f66cfd5d99c2a049a5b7d6e12d 100644 (file)
--- 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;
                }
@@ -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)
        {