From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 31 Oct 2010 21:42:37 +0000 (+0100)
Subject: pendulum: Q3A changes roll, not pitch, so let's do that here too
X-Git-Tag: xonotic-v0.1.0preview~218
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=754aadaffa8ee8c60f6b9a3b5d5249d795afbb69;p=xonotic%2Fxonotic-data.pk3dir.git

pendulum: Q3A changes roll, not pitch, so let's do that here too
---

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index fed2480dc..e52bc74a4 100644
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -505,7 +505,7 @@ void func_pendulum_controller_think()
 	if(self.owner.classname == "func_pendulum") // don't brake stuff if the func_bobbing was killtarget'ed
 	{
 		// * 10 so it will arrive in 0.1 sec
-		self.owner.avelocity_x = (remainder(v - self.owner.angles_x, 360)) * 10;
+		self.owner.avelocity_z = (remainder(v - self.owner.angles_z, 360)) * 10;
 	}
 };
 
@@ -542,7 +542,7 @@ void spawnfunc_func_pendulum()
 	if(!self.freq)
 	{
 		// find pendulum length (same formula as Q3A)
-		self.freq = 1 / (M_PI * 2) * sqrt(cvar("sv_gravity") / (3 * fabs(self.mins_z)));
+		self.freq = 1 / (M_PI * 2) * sqrt(cvar("sv_gravity") / (3 * max(8, fabs(self.mins_z))));
 	}
 
 	// wait for targets to spawn