Merge branch 'master' of i:/scorched3d-git

jomkz · Jul 30, 2014 · 6140b2f · 6140b2f
2 parents ce4ca18 + 23b41c4
commit 6140b2f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/scorched/src/common/actions/ShotProjectile.cpp b/scorched/src/common/actions/ShotProjectile.cpp
@@ -232,10 +232,14 @@ void ShotProjectile::simulate(fixed frameTime, bool &remove)
 		}
 	}
 
-	if (wobbleSpin_ > 0)
+ 	if (wobbleSpin_ > 0)
 	{
 		FixedVector up(0, 0, 1);
 		FixedVector velocityPerp = (velocity_.Normalize() * up).Normalize();
+		if (velocityPerp == FixedVector::getNullVector()) 
+		{
+			velocityPerp = FixedVector(1, 0, 0);
+		}
 		FixedVector forceDir = ((velocityPerp * physicsSpin_.cos()) * wobbleAmount_ * velocity_.Magnitude() / 50);
 		getPhysics().applyOffset(forceDir);