From ab1407a7e1f6a1702f5c2932e01f5be060be5746 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 20 Jan 2020 02:41:46 +1000 Subject: [PATCH] Update item sizes in other locations, to match the new default --- qcsrc/common/t_items.qc | 16 ++++------------ qcsrc/common/weapons/weapon/porto.qc | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 1029f7865..df3bb9b52 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -174,8 +174,7 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew) if(sf & ISF_SIZE) { - float use_bigsize = ReadByte(); - setsize(this, '-16 -16 0', (use_bigsize) ? '16 16 48' : '16 16 32'); + setsize(this, '-16 -16 0', '16 16 48'); } if(sf & ISF_STATUS) // need to read/write status first so model can handle simple, fb etc. @@ -205,8 +204,6 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew) this.solid = SOLID_TRIGGER; //this.flags |= FL_ITEM; - bool use_bigsize = ReadByte(); - this.fade_end = ReadShort(); this.fade_start = ReadShort(); if(!warpzone_warpzones_exist && this.fade_start && !autocvar_cl_items_nofade) @@ -257,7 +254,7 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew) precache_model(this.mdl); _setmodel(this, this.mdl); - setsize(this, '-16 -16 0', (use_bigsize) ? '16 16 48' : '16 16 32'); + setsize(this, '-16 -16 0', '16 16 48'); } if(sf & ISF_COLORMAP) @@ -326,19 +323,14 @@ bool ItemSend(entity this, entity to, int sf) WriteAngle(MSG_ENTITY, this.angles_z); } - if(sf & ISF_SIZE) - { - Pickup p = this.itemdef; - WriteByte(MSG_ENTITY, p.instanceOfPowerup || p.instanceOfHealth || p.instanceOfArmor); - } + // sets size on the client, unused on server + //if(sf & ISF_SIZE) if(sf & ISF_STATUS) WriteByte(MSG_ENTITY, this.ItemStatus); if(sf & ISF_MODEL) { - Pickup p = this.itemdef; - WriteByte(MSG_ENTITY, p.instanceOfPowerup || p.instanceOfHealth || p.instanceOfArmor); WriteShort(MSG_ENTITY, this.fade_end); WriteShort(MSG_ENTITY, this.fade_start); diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc index 44b73fb05..fd33dacde 100644 --- a/qcsrc/common/weapons/weapon/porto.qc +++ b/qcsrc/common/weapons/weapon/porto.qc @@ -118,7 +118,7 @@ void W_Porto_Fail(entity this, float failhard) if(this.cnt < 0 && !failhard && this.realowner.playerid == this.playerid && !IS_DEAD(this.realowner) && !(STAT(WEAPONS, this.realowner) & WEPSET(PORTO))) { - setsize(this, '-16 -16 0', '16 16 32'); + setsize(this, '-16 -16 0', '16 16 48'); setorigin(this, this.origin + trace_plane_normal); if(move_out_of_solid(this)) { -- 2.39.2