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

Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64

Browse source
This commit is contained in:
def 2015-03-28 21:53:13 +01:00
parent 14d0d2ba08 8290f447e0
commit bb88034def
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/menus_browser.cpp
View file

@ -512,7 +512,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
Status.Margin(5.0f, &Status);
CUIRect QuickSearch, QuickExclude, Button, Status2, Status3;
Status.VSplitRight(240.0f, &Status2, &Status3);
Status.VSplitRight(250.0f, &Status2, &Status3);
Status2.VSplitMid(&QuickSearch, &QuickExclude);
QuickExclude.VSplitLeft(5.0f, 0, &QuickExclude);

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

@ -1606,6 +1606,7 @@ void CCharacter::HandleTiles(int Index)
if(((m_TileIndex == TILE_REFILL_JUMPS) || (m_TileFIndex == TILE_REFILL_JUMPS)) && !m_LastRefillJumps)
{
m_Core.m_JumpedTotal = 0;
m_Core.m_Jumped = 0;
m_LastRefillJumps = true;
}
if((m_TileIndex != TILE_REFILL_JUMPS) && (m_TileFIndex != TILE_REFILL_JUMPS))