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

Stop at top tiles now give jumps back

Browse source 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-23 02:05:29 +02:00
parent 8b67e70dfb
commit 05f8edb880
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -704,8 +704,8 @@ void CCharacter::Tick()
{ {
if((int)GameServer()->Collision()->GetPos(TileIndex1).y < (int)m_Core.m_Pos.y) if((int)GameServer()->Collision()->GetPos(TileIndex1).y < (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPos.y; m_Core.m_Pos.y = m_PrevPos.y;
if(m_Jumped&3 && m_Core.m_Jumped != m_Jumped) // check double jump m_Core.m_Jumped = 0;
m_Core.m_Jumped = m_Jumped; //m_Jumped = 1;
m_Core.m_Vel.y = 0; m_Core.m_Vel.y = 0;
} }
} }
@ -715,8 +715,7 @@ void CCharacter::Tick()
{ {
if((int)GameServer()->Collision()->GetPos(TileIndex2).y < (int)m_Core.m_Pos.y) if((int)GameServer()->Collision()->GetPos(TileIndex2).y < (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPos.y; m_Core.m_Pos.y = m_PrevPos.y;
if(m_Jumped&3 && m_Core.m_Jumped != m_Jumped) // check double jump m_Core.m_Jumped = 0;
m_Core.m_Jumped = m_Jumped;
m_Core.m_Vel.y = 0; m_Core.m_Vel.y = 0;
} }
} }