From: Samual Lenks <samual@xonotic.org>
Date: Mon, 23 Jul 2012 18:03:40 +0000 (-0400)
Subject: Finish up the aiming code
X-Git-Tag: xonotic-v0.8.0~152^2~408^2~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5ebc99271d5778d4eafced015dedc05224e502cc;p=xonotic%2Fxonotic-data.pk3dir.git

Finish up the aiming code
---

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index d9bf7f1cc..1e067647b 100644
--- 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);
 	}