[nexuiz-commits] r7570 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-01 01:54:13 -0400 (Tue, 01 Sep 2009)
New Revision: 7570

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
fix size calc in shockwave


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-08-31 15:17:32 UTC (rev 7569)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-09-01 05:54:13 UTC (rev 7570)
@@ -2530,7 +2530,6 @@
 	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 @@
 		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);
 }