From 66e5529a1b022dcc4e7b357f01e1bc3978a76533 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 1 Sep 2009 05:54:13 +0000 Subject: [PATCH] fix size calc in shockwave git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7570 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/miscfunctions.qc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index db384c19c..47bbca8f9 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -2530,7 +2530,6 @@ void modeleffect_spawn(string m, float f, vector o, vector v, vector ang, vector e.alpha = a; e.teleport_time = t1; e.fade_time = t2; - sz = max(s0, s2); if(s0 >= 0) e.scale = s0 / max6(-e.mins_x, -e.mins_y, -e.mins_z, e.maxs_x, e.maxs_y, e.maxs_z); else @@ -2539,6 +2538,7 @@ void modeleffect_spawn(string m, float f, vector o, vector v, vector ang, vector e.scale2 = s2 / max6(-e.mins_x, -e.mins_y, -e.mins_z, e.maxs_x, e.maxs_y, e.maxs_z); else e.scale2 = -s2; + sz = max(e.scale, e.scale2); setsize(e, e.mins * sz, e.maxs * sz); Net_LinkEntity(e, FALSE, 0.1, modeleffect_SendEntity); } -- 2.39.2