edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix prediction

Browse source
This commit is contained in:
def 2013-08-05 19:58:51 +02:00
parent 111d5c7f10
commit 4987b26b7b
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/editor/front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 274 KiB

After

Width:  |  Height:  |  Size: 290 KiB

6
src/game/gamecore.cpp
View file

@ -64,6 +64,8 @@ void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore
m_pTeams = pTeams; m_pTeams = pTeams;
m_Id = -1; m_Id = -1;
m_Hook = true;
m_Collision = true;
} }
void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore* pTeams, std::map<int, std::vector<vec2> > pTeleOuts) void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore* pTeams, std::map<int, std::vector<vec2> > pTeleOuts)
@ -74,6 +76,8 @@ void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore
m_pTeams = pTeams; m_pTeams = pTeams;
m_Id = -1; m_Id = -1;
m_Hook = true;
m_Collision = true;
} }
void CCharacterCore::Reset() void CCharacterCore::Reset()
@ -88,6 +92,8 @@ void CCharacterCore::Reset()
m_HookedPlayer = -1; m_HookedPlayer = -1;
m_Jumped = 0; m_Jumped = 0;
m_TriggeredEvents = 0; m_TriggeredEvents = 0;
m_Hook = true;
m_Collision = true;
} }
void CCharacterCore::Tick(bool UseInput) void CCharacterCore::Tick(bool UseInput)

2
src/game/server/entities/character.cpp
View file

@ -1683,7 +1683,5 @@ void CCharacter::DDRaceInit()
m_TeleCheckpoint = 0; m_TeleCheckpoint = 0;
m_EndlessHook = g_Config.m_SvEndlessDrag; m_EndlessHook = g_Config.m_SvEndlessDrag;
m_Hit = g_Config.m_SvHit ? HIT_ALL : DISABLE_HIT_GRENADE|DISABLE_HIT_HAMMER|DISABLE_HIT_RIFLE|DISABLE_HIT_SHOTGUN; m_Hit = g_Config.m_SvHit ? HIT_ALL : DISABLE_HIT_GRENADE|DISABLE_HIT_HAMMER|DISABLE_HIT_RIFLE|DISABLE_HIT_SHOTGUN;
m_Core.m_Collision = true;
m_Core.m_Hook = true;
m_SuperJump = false; m_SuperJump = false;
} }