Fix a bug that caused insane speeds when respawning and pressing forward + jump,...

diff --git a/data/qcsrc/server/antilag.qc b/data/qcsrc/server/antilag.qc
index cc10654bf5fc6ec9d2fc712b22f95253679da368..48cf4d719458cff24bc545bcd0e11fb47fcc8f3b 100644 (file)
--- a/data/qcsrc/server/antilag.qc
+++ b/data/qcsrc/server/antilag.qc
@@ -49,7 +49,7 @@ float antilag_find(entity e, float t)
        return -1;\r
 }\r
 \r
-vector lerp(float t0, vector v0, float t1, vector v1, float t)\r
+vector lerpv(float t0, vector v0, float t1, vector v1, float t)\r
 {\r
        return v0 + (v1 - v0) * ((t - t0) / (t1 - t0));\r
 }\r
@@ -69,7 +69,7 @@ vector antilag_takebackorigin(entity e, float t)
        if(i1 >= ANTILAG_MAX_ORIGINS)\r
                i1 = 0;\r
 \r
-       return lerp(e.(antilag_times[i0]), e.(antilag_origins[i0]), e.(antilag_times[i1]), e.(antilag_origins[i1]), t);\r
+       return lerpv(e.(antilag_times[i0]), e.(antilag_origins[i0]), e.(antilag_times[i1]), e.(antilag_origins[i1]), t);\r
 }\r
 \r
 vector antilag_takebackavgvelocity(entity e, float t0, float t1)\r

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 589f64909ed26e8450e757d02c0a8523f4b269e2..d1fda906ce90b25d014d6172303e15fd9a700419 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -913,6 +913,7 @@ void PutClientInServer (void)
                self.punchvector = '0 0 0';\r
                self.oldvelocity = self.velocity;\r
                self.fire_endtime = -1;\r
+               self.lastteleporttime = time;\r
 \r
                msg_entity = self;\r
                WRITESPECTATABLE_MSG_ONE({\r

diff --git a/data/qcsrc/server/t_teleporters.qc b/data/qcsrc/server/t_teleporters.qc
index 07159e4c2fe59fcae461f4b268be9c8a9a67b071..60ca03991907059f5e79cf1ff384e8f297d75e1b 100644 (file)
--- a/data/qcsrc/server/t_teleporters.qc
+++ b/data/qcsrc/server/t_teleporters.qc
@@ -132,8 +132,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
                        player.pushltime = 0;\r
                }\r
 \r
-               if(player.isbot)\r
-                       player.lastteleporttime = time;\r
+               player.lastteleporttime = time;\r
 \r
                // stop player name display\r
                {\r