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 pull request #1778 from d3fault/instant-respawn

Browse source 
respawn is now instant, but rate limited to 3 sec unless player clicks mouse1
This commit is contained in:
Dennis Felsing 2019-06-11 18:04:52 +02:00 committed by GitHub
parent bbb1b2cdef 10e06f919e
commit 617d123024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -901,7 +901,8 @@ void CCharacter::Die(int Killer, int Weapon)
// a nice sound // a nice sound
GameServer()->CreateSound(m_Pos, SOUND_PLAYER_DIE, Teams()->TeamMask(Team(), -1, m_pPlayer->GetCID())); GameServer()->CreateSound(m_Pos, SOUND_PLAYER_DIE, Teams()->TeamMask(Team(), -1, m_pPlayer->GetCID()));
// this is for auto respawn after 3 secs // this is to rate limit respawning to 3 secs
m_pPlayer->m_PreviousDieTick = m_pPlayer->m_DieTick;
m_pPlayer->m_DieTick = Server()->Tick(); m_pPlayer->m_DieTick = Server()->Tick();
m_Alive = false; m_Alive = false;

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

@ -12,6 +12,7 @@
#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)
@ -37,6 +38,7 @@ CPlayer::~CPlayer()
void CPlayer::Reset() void CPlayer::Reset()
{ {
m_DieTick = Server()->Tick(); m_DieTick = Server()->Tick();
m_PreviousDieTick = m_DieTick;
m_JoinTick = Server()->Tick(); m_JoinTick = Server()->Tick();
delete m_pCharacter; delete m_pCharacter;
m_pCharacter = 0; m_pCharacter = 0;
@ -196,7 +198,9 @@ void CPlayer::Tick()
if(!GameServer()->m_World.m_Paused) if(!GameServer()->m_World.m_Paused)
{ {
if(!m_pCharacter && m_DieTick+Server()->TickSpeed()*3 <= Server()->Tick()) int EarliestRespawnTick = m_PreviousDieTick+Server()->TickSpeed()*3;
int RespawnTick = std::max(m_DieTick, EarliestRespawnTick);
if(!m_pCharacter && RespawnTick <= Server()->Tick())
m_Spawning = true; m_Spawning = true;
if(m_pCharacter) if(m_pCharacter)
@ -219,6 +223,7 @@ void CPlayer::Tick()
else else
{ {
++m_DieTick; ++m_DieTick;
++m_PreviousDieTick;
++m_JoinTick; ++m_JoinTick;
++m_LastActionTick; ++m_LastActionTick;
++m_TeamChangeTick; ++m_TeamChangeTick;

1
src/game/server/player.h
View file

@ -92,6 +92,7 @@ public:
} m_TeeInfos; } m_TeeInfos;
int m_DieTick; int m_DieTick;
int m_PreviousDieTick;
int m_Score; int m_Score;
int m_JoinTick; int m_JoinTick;
bool m_ForceBalanced; bool m_ForceBalanced;