From 74f08995afe99e34f7e8e3848227aa9261fcf3d5 Mon Sep 17 00:00:00 2001 From: Jordy Ruiz Date: Wed, 4 Mar 2020 00:13:48 +0000 Subject: [PATCH] Let people choose when they can respawn in a longer time window --- datasrc/maps | 2 +- src/game/server/player.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datasrc/maps b/datasrc/maps index 756794092a..7fefdb4c64 160000 --- a/datasrc/maps +++ b/datasrc/maps @@ -1 +1 @@ -Subproject commit 756794092aed5c26828b4bb12df6f8275752f5b5 +Subproject commit 7fefdb4c643f4e623f179460b8e68cd51f4d5e9d diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index 72a3cfe6da..7a58117df7 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -128,7 +128,7 @@ void CPlayer::Tick() if(!m_pCharacter && m_Team == TEAM_SPECTATORS && m_SpecMode == SPEC_FREEVIEW) m_ViewPos -= vec2(clamp(m_ViewPos.x-m_LatestActivity.m_TargetX, -500.0f, 500.0f), clamp(m_ViewPos.y-m_LatestActivity.m_TargetY, -400.0f, 400.0f)); - if(!m_pCharacter && m_DieTick+Server()->TickSpeed()*3 <= Server()->Tick() && !m_DeadSpecMode) + if(!m_pCharacter && m_DieTick+Server()->TickSpeed()*20 <= Server()->Tick() && !m_DeadSpecMode) Respawn(); if(!m_pCharacter && m_Team == TEAM_SPECTATORS && m_pSpecFlag)