]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
support initial roll angle too
authorRudolf Polzer <divverent@alientrap.org>
Sun, 31 Oct 2010 21:49:26 +0000 (22:49 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 31 Oct 2010 21:49:26 +0000 (22:49 +0100)
qcsrc/server/t_plats.qc

index e52bc74a422094829b0bb4cdb47785f32af04c1f..d92a2539d42487fb436bfa19c0c53999170e1bfc 100644 (file)
@@ -501,7 +501,7 @@ void func_pendulum_controller_think()
 
        // calculate sinewave using makevectors
        makevectors((self.nextthink * self.owner.freq + self.owner.phase) * '0 360 0');
 
        // calculate sinewave using makevectors
        makevectors((self.nextthink * self.owner.freq + self.owner.phase) * '0 360 0');
-       v = self.owner.speed * v_forward_y;
+       v = self.owner.speed * v_forward_y + self.cnt;
        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
        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
@@ -545,6 +545,9 @@ void spawnfunc_func_pendulum()
                self.freq = 1 / (M_PI * 2) * sqrt(cvar("sv_gravity") / (3 * max(8, fabs(self.mins_z))));
        }
 
                self.freq = 1 / (M_PI * 2) * sqrt(cvar("sv_gravity") / (3 * max(8, fabs(self.mins_z))));
        }
 
+       // copy initial angle
+       self.cnt = self.angles_z;
+
        // wait for targets to spawn
        controller = spawn();
        controller.classname = "func_pendulum_controller";
        // wait for targets to spawn
        controller = spawn();
        controller.classname = "func_pendulum_controller";