X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fcalculations.qc;h=513af5209d670cac485f046342922c5e003c0bf3;hb=0bd99205bd154e058edc6b82995d24e3375f5f97;hp=367bab6afb26c5aba16179d96fae28096b765827;hpb=646e82672a7a8b8db0be0caf5dbd062b0d04da96;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/calculations.qc b/qcsrc/common/weapons/calculations.qc
index 367bab6af..513af5209 100644
--- a/qcsrc/common/weapons/calculations.qc
+++ b/qcsrc/common/weapons/calculations.qc
@@ -90,15 +90,11 @@ vector solve_cubic_pq(float p, float q)
 		// cos(a)
 		// cos(a + 2pi/3)
 		// cos(a + 4pi/3)
-		return
-			u *
-			(
-				'1 0 0' * cos(a + 2.0/3.0*M_PI)
-				+
-				'0 1 0' * cos(a + 4.0/3.0*M_PI)
-				+
-				'0 0 1' * cos(a)
-			);
+		return u * vec3(
+			cos(a + 2.0/3.0*M_PI),
+			cos(a + 4.0/3.0*M_PI),
+			cos(a)
+		);
 	}
 	else if(D == 0)
 	{
@@ -107,17 +103,15 @@ vector solve_cubic_pq(float p, float q)
 			return '0 0 0';
 		u = 3*q/p;
 		v = -u/2;
-		if(u >= v)
-			return '1 1 0' * v + '0 0 1' * u;
-		else
-			return '0 1 1' * v + '1 0 0' * u;
+		return (u >= v) ? vec3(v, v, u) : vec3(u, v, v);
 	}
 	else
 	{
 		// cardano
-		u = cbrt(-q/2.0 + sqrt(D));
-		v = cbrt(-q/2.0 - sqrt(D));
-		return '1 1 1' * (u + v);
+		//u = cbrt(-q/2.0 + sqrt(D));
+		//v = cbrt(-q/2.0 - sqrt(D));
+		a = cbrt(-q/2.0 + sqrt(D)) + cbrt(-q/2.0 - sqrt(D));
+		return vec3(a, a, a);
 	}
 }
 vector solve_cubic_abcd(float a, float b, float c, float d)
@@ -137,11 +131,7 @@ vector solve_cubic_abcd(float a, float b, float c, float d)
 
 vector findperpendicular(vector v)
 {
-	vector p;
-	p.x = v.z;
-	p.y = -v.x;
-	p.z = v.y;
-	return normalize(cliptoplane(p, v));
+	return normalize(cliptoplane(vec3(v.z, -v.x, v.y), v));
 }
 
 #ifdef SVQC