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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-19 16:35:16 -0400 (Sat, 19 Sep 2009)
New Revision: 7837

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
Log:
also commit the CODE :P


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-09-19 20:34:14 UTC (rev 7836)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-09-19 20:35:16 UTC (rev 7837)
@@ -1247,7 +1247,7 @@
 	EXACTTRIGGER_INIT;
     if(self.radius)
     {
-        if(!self.strength) self.strength = 2000;
+        if(!self.strength) self.strength = 2000 * cvar("g_triggerimpulse_radial_multiplier");
         setorigin(self, self.origin);
         setsize(self, '-1 -1 -1' * self.radius,'1 1 1' * self.radius);
         self.touch = trigger_impulse_touch3;
@@ -1256,12 +1256,13 @@
     {
         if(self.target)
         {
-            if(!self.strength) self.strength = 950;
+            if(!self.strength) self.strength = 950 * cvar("g_triggerimpulse_directional_multiplier");
             self.touch = trigger_impulse_touch1;
         }
         else
         {
             if(!self.strength) self.strength = 0.9;
+			self.strength = pow(self.strength, cvar("g_triggerimpulse_accel_power")) * cvar("g_triggerimpulse_accel_multiplier");
             self.touch = trigger_impulse_touch2;
         }
     }