From: Samual Lenks <samual@xonotic.org>
Date: Sun, 8 Dec 2013 04:25:57 +0000 (-0500)
Subject: Done with Electro for now :D
X-Git-Tag: xonotic-v0.8.0~152^2~305
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=151fc193ebe842e8e53639538df1603f969deee0;p=xonotic%2Fxonotic-data.pk3dir.git

Done with Electro for now :D
---

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index f96b32e4f..2f16f8a11 100644
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -47,16 +47,14 @@ REGISTER_WEAPON(
 
 #ifdef SVQC
 ELECTRO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
+.float electro_count;
+.float electro_secondarytime;
+void W_Plasma_Explode_Combo(void);
 #endif
 #else
 #ifdef SVQC
 void spawnfunc_weapon_electro() { weapon_defaultspawnfunc(WEP_ELECTRO); }
 
-.float electro_count;
-.float electro_secondarytime;
-
-void W_Plasma_Explode_Combo(void);
-
 void W_Plasma_TriggerCombo(vector org, float rad, entity own)
 {
 	entity e = WarpZone_FindRadius(org, rad, !WEP_CVAR(electro, combo_comboradius_thruwall));
@@ -324,8 +322,7 @@ float W_Electro(float req)
 		case WR_AIM:
 		{
 			self.BUTTON_ATCK = self.BUTTON_ATCK2 = FALSE;
-			if(vlen(self.origin-self.enemy.origin) > 1000)
-				self.bot_secondary_electromooth = 0;
+			if(vlen(self.origin-self.enemy.origin) > 1000) { self.bot_secondary_electromooth = 0; }
 			if(self.bot_secondary_electromooth == 0)
 			{
 				float shoot;
@@ -343,7 +340,7 @@ float W_Electro(float req)
 			}
 			else
 			{
-				if(bot_aim(WEP_CVAR_SEC(electro, speed), autocvar_g_balance_mortar_secondary_speed_up, WEP_CVAR_SEC(electro, lifetime), TRUE)) // WHAT THE ACTUAL FUUUUUUUUUCK?!?!? WEAPONTODO
+				if(bot_aim(WEP_CVAR_SEC(electro, speed), WEP_CVAR_SEC(electro, speed_up), WEP_CVAR_SEC(electro, lifetime), TRUE))
 				{
 					self.BUTTON_ATCK2 = TRUE;
 					if(random() < 0.03) self.bot_secondary_electromooth = 0;
@@ -370,7 +367,8 @@ float W_Electro(float req)
 				
 				return TRUE;
 			}
-			if (self.BUTTON_ATCK)
+			
+			if(self.BUTTON_ATCK)
 			{
 				if(weapon_prepareattack(0, WEP_CVAR_PRI(electro, refire)))
 				{