From efbc05c9a83e8cb541fd7585bbd64817682bb972 Mon Sep 17 00:00:00 2001 From: Learath Date: Thu, 13 Jun 2019 23:24:06 +0200 Subject: [PATCH] No need for --- src/game/server/player.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index 25677113f..ba2626434 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -12,8 +12,6 @@ #include "gamemodes/DDRace.h" #include -#include - MACRO_ALLOC_POOL_ID_IMPL(CPlayer, MAX_CLIENTS) IServer *CPlayer::Server() const { return m_pGameServer->Server(); } @@ -199,7 +197,7 @@ void CPlayer::Tick() if(!GameServer()->m_World.m_Paused) { 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()) m_Spawning = true;