From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 17 Oct 2010 20:02:53 +0000 (+0200)
Subject: don't send the effect number for infinite non-collisiontesting lasers
X-Git-Tag: xonotic-v0.1.0preview~292
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=98496b8f7cbb74f30232f5c52bb38158623bb597;p=xonotic%2Fxonotic-data.pk3dir.git

don't send the effect number for infinite non-collisiontesting lasers
---

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 32119283e..9bc5dce9d 100644
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -101,7 +101,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)
 	{
diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index d627cd86e..d97413f10 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -1104,7 +1104,8 @@ float laser_SendEntity(entity to, float fl)
 			WriteByte(MSG_ENTITY, bound(0, self.scale * 16.0, 255));
 			WriteByte(MSG_ENTITY, bound(0, self.modelscale * 16.0, 255));
 		}
-		WriteShort(MSG_ENTITY, self.cnt + 1);
+		if((fl & 0x80) || !(fl & 0x10)) // effect doesn't need sending if the laser is infinite and has collision testing turned off
+			WriteShort(MSG_ENTITY, self.cnt + 1);
 	}
 	if(fl & 2)
 	{