summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRedix <redix@hotmail.de>2017-02-08 12:03:39 +0100
committerRedix <redix@hotmail.de>2017-02-08 12:03:39 +0100
commitbb855f043016d51ae32ceb248b95ea538f0073ae (patch)
treed8d892f4cc7abb8508a6f4291c6e505111de58b8
parent524acbd6d2bbf899c1e1fcb2c44b7f619c257771 (diff)
Fixed teleport prediction0.6.4-cp-r2
-rw-r--r--src/game/client/gameclient.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index e76a47036..d25516cda 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -584,8 +584,9 @@ void CGameClient::UpdatePositions()
void CGameClient::EvolveCharacter(CNetObj_Character *pCharacter, int Tick)
{
CWorldCore TempWorld;
- // TODO: server info
- TempWorld.m_Teleport = g_Config.m_ClPredictTeleport;
+ CServerInfo ServerInfo;
+ Client()->GetServerInfo(&ServerInfo);
+ TempWorld.m_Teleport = g_Config.m_ClPredictTeleport && IsRace(&ServerInfo) && !IsDDNet(&ServerInfo);
CCharacterCore TempCore;
mem_zero(&TempCore, sizeof(TempCore));
TempCore.Init(&TempWorld, Collision());