Finish up the aiming code

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index d9bf7f1cc1c0a0337c653ab9d655a5ad49b53f81..1e067647b86d51e359148bbd58f0db091dc4aa8f 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -363,19 +363,10 @@ void spawnfunc_weapon_laser (void)
 
 float w_laser(float req)
 {
-       float r1;
-       float r2;
        if (req == WR_AIM)
        {
-               if(autocvar_g_balance_laser_secondary)
-               {
-                       r1 = autocvar_g_balance_laser_primary_damage;
-                       r2 = autocvar_g_balance_laser_secondary_damage;
-                       if (random() * (r2 + r1) > r1)
-                               self.BUTTON_ATCK2 = bot_aim(autocvar_g_balance_laser_secondary_speed, 0, autocvar_g_balance_laser_secondary_lifetime, FALSE);
-                       else
-                               self.BUTTON_ATCK = bot_aim(autocvar_g_balance_laser_primary_speed, 0, autocvar_g_balance_laser_primary_lifetime, FALSE);
-               }
+               if((autocvar_g_balance_laser_secondary == 2) && (vlen(self.origin-self.enemy.origin) <= autocvar_g_balance_laser_secondary_melee_range))
+                       self.BUTTON_ATCK2 = bot_aim(1000000, 0, 0.001, FALSE);
                else
                        self.BUTTON_ATCK = bot_aim(1000000, 0, 1, FALSE);
        }