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

Fix jumping

Browse source
This commit is contained in:
def 2013-08-24 02:25:58 +02:00
parent 9028d77471
commit 1cc6977611
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/game/gamecore.cpp
View file

@ -66,6 +66,8 @@ void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore
m_Id = -1;
m_Hook = true;
m_Collision = true;
m_JumpedTotal = 0;
m_Jumps = 2;
}
void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore* pTeams, std::map<int, std::vector<vec2> > pTeleOuts)
@ -78,6 +80,8 @@ void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore
m_Id = -1;
m_Hook = true;
m_Collision = true;
m_JumpedTotal = 0;
m_Jumps = 2;
}
void CCharacterCore::Reset()
@ -174,34 +178,26 @@ void CCharacterCore::Tick(bool UseInput)
// handle jump
if(m_Input.m_Jump)
{
if (m_JumpedTotal < m_Jumps - 1 || Grounded && m_Jumps == 1)
if(!(m_Jumped&1))
{
if (m_Jumped > 1)
m_Jumped = 1;
if(!(m_Jumped&1))
if(Grounded)
{
if(Grounded)
{
m_TriggeredEvents |= COREEVENT_GROUND_JUMP;
m_Vel.y = -m_pWorld->m_Tuning.m_GroundJumpImpulse;
m_Jumped |= 1;
m_JumpedTotal = 1;
}
else if(!(m_Jumped&2))
{
m_TriggeredEvents |= COREEVENT_AIR_JUMP;
m_Vel.y = -m_pWorld->m_Tuning.m_AirJumpImpulse;
m_Jumped |= 3;
m_JumpedTotal++;
}
m_TriggeredEvents |= COREEVENT_GROUND_JUMP;
m_Vel.y = -m_pWorld->m_Tuning.m_GroundJumpImpulse;
m_Jumped |= 1;
m_JumpedTotal = 1;
}
else if(!(m_Jumped&2))
{
m_TriggeredEvents |= COREEVENT_AIR_JUMP;
m_Vel.y = -m_pWorld->m_Tuning.m_AirJumpImpulse;
m_Jumped |= 3;
m_JumpedTotal++;
}
}
}
else
{
m_Jumped &= ~1;
}
// handle hook
if(m_Input.m_Hook)

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

@ -1592,6 +1592,13 @@ void CCharacter::DDRacePostCoreTick()
if (m_DeepFreeze && !m_Super)
Freeze();
if (m_Core.m_Jumps == 0)
m_Core.m_Jumped = 3;
else if (m_Core.m_Jumps == 1 && m_Core.m_Jumped > 0)
m_Core.m_Jumped = 3;
else if (m_Core.m_JumpedTotal < m_Core.m_Jumps - 1 && m_Core.m_Jumped > 1)
m_Core.m_Jumped = 1;
if ((m_Super || m_SuperJump) && m_Core.m_Jumped > 1)
m_Core.m_Jumped = 1;