From 4c7feea038d28ded308193a3f12bae9040b550e4 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 8 Dec 2013 16:43:09 +1100 Subject: [PATCH] Attempt to fix some item linking issues --- qcsrc/server/t_items.qc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 86d19beec..f9bb3ff10 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -1015,9 +1015,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, return; } - if(self.angles != '0 0 0') - self.SendFlags |= ISF_ANGLES; - self.reset = Item_Reset; // it's a level item if(self.spawnflags & 1) @@ -1036,9 +1033,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, setsize (self, '-16 -16 0', '16 16 48'); else setsize (self, '-16 -16 0', '16 16 32'); - - self.SendFlags |= ISF_SIZE; - + // note droptofloor returns FALSE if stuck/or would fall too far droptofloor(); waypoint_spawnforitem(self); @@ -1112,8 +1107,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, } setsize (self, self.pos1, self.pos2); - self.SendFlags |= ISF_SIZE; - if(itemflags & FL_POWERUP) self.ItemStatus |= ITS_ANIMATE1; @@ -1144,6 +1137,10 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, Item_Reset(); Net_LinkEntity(self, FALSE, 0, ItemSend); + + self.SendFlags |= ISF_SIZE; + if(self.angles) + self.SendFlags |= ISF_ANGLES; // call this hook after everything else has been done if(MUTATOR_CALLHOOK(Item_Spawn)) -- 2.39.2