Merge remote-tracking branch 'origin/master' into samual/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_subs.qc

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 6c4089c83bf645776098a9b06820f548b409d70a..22c8931bef8813bc43536ab950b281b1a7def223 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -250,9 +250,8 @@ void SUB_CalcMove (vector tdest, float tspeed, void() func)
        // Very short animations don't really show off the effect
        // of controlled animation, so let's just use linear movement.
        // Alternatively entities can choose to specify non-controlled movement.
-       // The default, controlled movement, is value 0, the only currently
-       // implemented alternative movement is linear, which is any other value.
-       if (traveltime < 0.15 || self.platmovetype)
+        // The only currently implemented alternative movement is linear (value 1)
+       if (traveltime < 0.15 || self.platmovetype == 1)
        {
                self.velocity = delta * (1/traveltime); // QuakeC doesn't allow vector/float division
                self.nextthink = self.ltime + traveltime;
@@ -263,7 +262,7 @@ void SUB_CalcMove (vector tdest, float tspeed, void() func)
        controller.classname = "SUB_CalcMove_controller";
        controller.owner = self;
        controller.origin = self.origin; // starting point
-       controller.finaldest = (tdest + '0 0 1'); // where do we want to end? Offset to overshoot a bit.
+       controller.finaldest = (tdest + '0 0 0.125'); // where do we want to end? Offset to overshoot a bit.
        controller.destvec = delta;
        controller.animstate_starttime = time;
        controller.animstate_endtime = time + traveltime;