From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 15 Apr 2011 21:15:23 +0000 (+0300)
Subject: Fix a bug that caused insane speeds when respawning and pressing forward + jump,... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6040cbedacd216559b76aa60d776cee6023dd704;p=voretournament%2Fvoretournament.git

Fix a bug that caused insane speeds when respawning and pressing forward + jump, when g_multijump is active
---

diff --git a/data/qcsrc/server/antilag.qc b/data/qcsrc/server/antilag.qc
index cc10654b..48cf4d71 100644
--- 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;
 }
 
-vector lerp(float t0, vector v0, float t1, vector v1, float t)
+vector lerpv(float t0, vector v0, float t1, vector v1, float t)
 {
 	return v0 + (v1 - v0) * ((t - t0) / (t1 - t0));
 }
@@ -69,7 +69,7 @@ vector antilag_takebackorigin(entity e, float t)
 	if(i1 >= ANTILAG_MAX_ORIGINS)
 		i1 = 0;
 
-	return lerp(e.(antilag_times[i0]), e.(antilag_origins[i0]), e.(antilag_times[i1]), e.(antilag_origins[i1]), t);
+	return lerpv(e.(antilag_times[i0]), e.(antilag_origins[i0]), e.(antilag_times[i1]), e.(antilag_origins[i1]), t);
 }
 
 vector antilag_takebackavgvelocity(entity e, float t0, float t1)
diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 589f6490..d1fda906 100644
--- 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';
 		self.oldvelocity = self.velocity;
 		self.fire_endtime = -1;
+		self.lastteleporttime = time;
 
 		msg_entity = self;
 		WRITESPECTATABLE_MSG_ONE({
diff --git a/data/qcsrc/server/t_teleporters.qc b/data/qcsrc/server/t_teleporters.qc
index 07159e4c..60ca0399 100644
--- 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;
 		}
 
-		if(player.isbot)
-			player.lastteleporttime = time;
+		player.lastteleporttime = time;
 
 		// stop player name display
 		{