From 05f8edb880ec7be58de79f4483636218d953af71 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Mon, 23 Aug 2010 02:05:29 +0200 Subject: [PATCH] Stop at top tiles now give jumps back Signed-off-by: GreYFoXGTi --- src/game/server/entities/character.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 8dd597f0b..437e245c2 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -704,8 +704,8 @@ void CCharacter::Tick() { if((int)GameServer()->Collision()->GetPos(TileIndex1).y < (int)m_Core.m_Pos.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 = m_Jumped; + m_Core.m_Jumped = 0; + //m_Jumped = 1; 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) 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 = m_Jumped; + m_Core.m_Jumped = 0; m_Core.m_Vel.y = 0; } }