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

revert to ground jump at the same tick

Browse source
This commit is contained in:
c0d3d3v 2022-05-20 22:55:01 +02:00
parent ade1a28d12
commit 82ef97f549
No known key found for this signature in database
GPG key ID: 068AF680530DFF31
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/gamecore.cpp
View file

@ -154,14 +154,14 @@ void CCharacterCore::Tick(bool UseInput)
// m_Jumps == -1: A tee may only make one ground jump. Second jumped bit is always set // m_Jumps == -1: A tee may only make one ground jump. Second jumped bit is always set
// m_Jumps == 0: A tee may not make a jump. Second jumped bit is always set // m_Jumps == 0: A tee may not make a jump. Second jumped bit is always set
// m_Jumps == 1: A tee may do either a ground jump or an air jump. Second jumped bit is set after the first jump // m_Jumps == 1: A tee may do either a ground jump or an air jump. Second jumped bit is set after the first jump
// The second jump bit can be overridden by special tiles so that the tee can nevertheless jump. // The second jumped bit can be overridden by special tiles so that the tee can nevertheless jump.
// handle jump // handle jump
if(m_Input.m_Jump) if(m_Input.m_Jump)
{ {
if(!(m_Jumped & 1)) if(!(m_Jumped & 1))
{ {
if(Grounded && (!(m_Jumped & 2) || m_Jumps == -1)) if(Grounded && (!(m_Jumped & 2) || m_Jumps != 0))
{ {
m_TriggeredEvents |= COREEVENT_GROUND_JUMP; m_TriggeredEvents |= COREEVENT_GROUND_JUMP;
m_Vel.y = -m_Tuning.m_GroundJumpImpulse; m_Vel.y = -m_Tuning.m_GroundJumpImpulse;
@ -215,7 +215,6 @@ void CCharacterCore::Tick(bool UseInput)
// 2 bit = to track if all air-jumps have been used up (tee gets dark feet) // 2 bit = to track if all air-jumps have been used up (tee gets dark feet)
if(Grounded) if(Grounded)
{ {
// A tee must touch the ground for one tick before it can jump again.
m_Jumped &= ~2; m_Jumped &= ~2;
m_JumpedTotal = 0; m_JumpedTotal = 0;
} }