From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 29 Dec 2011 14:27:55 +0000 (+0100)
Subject: Wops - passing goes secondary
X-Git-Tag: xonotic-v0.6.0~40^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=403e172c923a6811ac8beed2f9356a8408537966;p=xonotic%2Fxonotic-data.pk3dir.git

Wops - passing goes secondary
---

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index 14c7348bcd..32ca0ee028 100644
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -721,14 +721,7 @@ void W_Nexball_Attack(float t)
 		mul = mi + (ma - mi) * mul; // range from the minimal power to the maximal power
 	}
 	
-	if(ball.enemy)
-	{
-        ball.think = W_Nexball_Think;
-        ball.nextthink = time;
-	    DropBall(ball, w_shotorg, trigger_push_calculatevelocity(ball.origin, ball.enemy, 32));
-	}
-	else
-        DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, FALSE));
+    DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, FALSE));
 	
 
 	//TODO: use the speed_up cvar too ??
@@ -736,6 +729,14 @@ void W_Nexball_Attack(float t)
 
 void W_Nexball_Attack2(void)
 {
+	if(ball.enemy)
+	{
+        ball.think = W_Nexball_Think;
+        ball.nextthink = time;
+	    DropBall(ball, w_shotorg, trigger_push_calculatevelocity(ball.origin, ball.enemy, 32));
+	    return;
+	}
+
 	entity missile;
 	if(!(balls & BALL_BASKET))
 		return;