From: Mario <mario@smbclan.net>
Date: Wed, 16 Dec 2015 05:58:47 +0000 (+1000)
Subject: Make CSQC items much more accurately predicted
X-Git-Tag: xonotic-v0.8.2~1489
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a5e87a7ffb0df1c65d19be0d698cf3034cceaef0;p=xonotic%2Fxonotic-data.pk3dir.git

Make CSQC items much more accurately predicted
---

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 35fd87832..d25849533 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -174,6 +174,9 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew)
         self.drawmask  = MASK_NORMAL;
 		self.move_movetype = self.movetype = MOVETYPE_TOSS;
         self.draw       = ItemDraw;
+        //self.move_flags |= FL_ITEM;
+
+        bool use_bigsize = ReadByte();
 
         self.fade_end = ReadShort();
         self.fade_start = ReadShort();
@@ -215,6 +218,8 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew)
 
         precache_model(self.mdl);
         _setmodel(self, self.mdl);
+
+        setsize(self, '-16 -16 0', (use_bigsize) ? '16 16 48' : '16 16 32');
     }
 
     if(sf & ISF_COLORMAP)
@@ -293,6 +298,8 @@ bool ItemSend(entity this, entity to, int sf)
 
 	if(sf & ISF_MODEL)
 	{
+		Pickup p = this.itemdef;
+		WriteByte(MSG_ENTITY, p.instanceOfPowerup || p.instanceOfHealth || p.instanceOfArmor);
 		WriteShort(MSG_ENTITY, self.fade_end);
 		WriteShort(MSG_ENTITY, self.fade_start);