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

newJumps → NewJumps

Browse source
This commit is contained in:
heinrich5991 2022-01-31 15:43:03 +01:00
parent 37fc74ccba
commit 87df5b8c14
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/client/prediction/entities/character.cpp
View file

@ -751,9 +751,9 @@ void CCharacter::HandleTiles(int Index)
}
else if(Collision()->GetSwitchType(MapIndex) == TILE_JUMP)
{
int newJumps = Collision()->GetSwitchDelay(MapIndex);
if(newJumps != m_Core.m_Jumps)
m_Core.m_Jumps = newJumps;
int NewJumps = Collision()->GetSwitchDelay(MapIndex);
if(NewJumps != m_Core.m_Jumps)
m_Core.m_Jumps = NewJumps;
}
else if(Collision()->GetSwitchType(MapIndex) == TILE_LFREEZE && Team() != TEAM_SUPER)
{

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

@ -1781,18 +1781,18 @@ void CCharacter::HandleTiles(int Index)
}
else if(GameServer()->Collision()->GetSwitchType(MapIndex) == TILE_JUMP)
{
int newJumps = GameServer()->Collision()->GetSwitchDelay(MapIndex);
int NewJumps = GameServer()->Collision()->GetSwitchDelay(MapIndex);
if(newJumps != m_Core.m_Jumps)
if(NewJumps != m_Core.m_Jumps)
{
char aBuf[256];
if(newJumps == 1)
str_format(aBuf, sizeof(aBuf), "You can jump %d time", newJumps);
if(NewJumps == 1)
str_format(aBuf, sizeof(aBuf), "You can jump %d time", NewJumps);
else
str_format(aBuf, sizeof(aBuf), "You can jump %d times", newJumps);
str_format(aBuf, sizeof(aBuf), "You can jump %d times", NewJumps);
GameServer()->SendChatTarget(GetPlayer()->GetCID(), aBuf);
if(newJumps == 0 && !m_SuperJump)
if(NewJumps == 0 && !m_SuperJump)
{
m_NeededFaketuning |= FAKETUNE_NOJUMP;
GameServer()->SendTuningParams(m_pPlayer->GetCID(), m_TuneZone); // update tunings
@ -1803,7 +1803,7 @@ void CCharacter::HandleTiles(int Index)
GameServer()->SendTuningParams(m_pPlayer->GetCID(), m_TuneZone); // update tunings
}
m_Core.m_Jumps = newJumps;
m_Core.m_Jumps = NewJumps;
}
}
else if(GameServer()->Collision()->GetSwitchType(MapIndex) == TILE_ADD_TIME && !m_LastPenalty)