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

Merge #1784

Browse source 
1784: No need for <algorithm> r=heinrich5991 a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
This commit is contained in:
bors[bot] 2019-06-13 21:29:08 +00:00
parent 4f665a904b efbc05c9a8
commit 3d2125c13a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/server/player.cpp
View file

@ -12,8 +12,6 @@
#include "gamemodes/DDRace.h" #include "gamemodes/DDRace.h"
#include <time.h> #include <time.h>
#include <algorithm>
MACRO_ALLOC_POOL_ID_IMPL(CPlayer, MAX_CLIENTS) MACRO_ALLOC_POOL_ID_IMPL(CPlayer, MAX_CLIENTS)
IServer *CPlayer::Server() const { return m_pGameServer->Server(); } IServer *CPlayer::Server() const { return m_pGameServer->Server(); }
@ -199,7 +197,7 @@ void CPlayer::Tick()
if(!GameServer()->m_World.m_Paused) if(!GameServer()->m_World.m_Paused)
{ {
int EarliestRespawnTick = m_PreviousDieTick+Server()->TickSpeed()*3; int EarliestRespawnTick = m_PreviousDieTick+Server()->TickSpeed()*3;
int RespawnTick = std::max(m_DieTick, EarliestRespawnTick); int RespawnTick = maximum(m_DieTick, EarliestRespawnTick);
if(!m_pCharacter && RespawnTick <= Server()->Tick()) if(!m_pCharacter && RespawnTick <= Server()->Tick())
m_Spawning = true; m_Spawning = true;