From bdb5a7169145f7982de9109bd4c833112a6b747b Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 5 Apr 2021 14:34:49 +0200 Subject: [PATCH] Fix incorrect size applied to mines and electro orbs when they stick to something (setmodel was overriding size applied by setsize) --- qcsrc/common/weapons/weapon/electro.qc | 2 +- qcsrc/common/weapons/weapon/minelayer.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index 1505503b3..0e2ef52cd 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -258,9 +258,9 @@ void W_Electro_Orb_Stick(entity this, entity to) newproj.owner = this.owner; newproj.realowner = this.realowner; - setsize(newproj, this.mins, this.maxs); setorigin(newproj, this.origin); setmodel(newproj, MDL_PROJECTILE_ELECTRO); + setsize(newproj, this.mins, this.maxs); newproj.angles = vectoangles(-trace_plane_normal); // face against the surface newproj.takedamage = this.takedamage; diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc index b458e2c37..f9ff84653 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@ -18,9 +18,9 @@ void W_MineLayer_Stick(entity this, entity to) newmine.owner = this.owner; newmine.realowner = this.realowner; - setsize(newmine, '-4 -4 -4', '4 4 4'); setorigin(newmine, this.origin); setmodel(newmine, MDL_MINELAYER_MINE); + setsize(newmine, '-4 -4 -4', '4 4 4'); newmine.angles = vectoangles(-trace_plane_normal); // face against the surface newmine.mine_orientation = -trace_plane_normal; -- 2.39.2