From 8f8b35f3d24184796181c332f13473dbbfb157f1 Mon Sep 17 00:00:00 2001 From: "Marius \"Teelevision\" Neugebauer" Date: Tue, 8 Apr 2014 03:05:30 +0200 Subject: added way to join spectators when caught --- src/game/server/player.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/game/server/player.cpp') diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index d2d621b7..91a75c9d 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -421,6 +421,7 @@ void CPlayer::AddZCatchVictim(int ClientID, int reason) // set victim's status victim->m_CaughtBy = m_ClientID; victim->m_SpecExplicit = false; + victim->m_zCatchJoinSpecWhenReleased = false; victim->SetTeamDirect(TEAM_SPECTATORS); victim->m_SpectatorID = m_ClientID; } @@ -443,6 +444,9 @@ void CPlayer::ReleaseZCatchVictim(int ClientID, int limit) victim->m_CaughtBy = ZCATCH_NOT_CAUGHT; victim->SetTeamDirect(GameServer()->m_pController->ClampTeam(1)); victim->m_SpectatorID = SPEC_FREEVIEW; + // SetTeam after SetTeamDirect, otherwise it would skip the message for joining the spectators + if(victim->m_zCatchJoinSpecWhenReleased) + victim->SetTeam(GameServer()->m_pController->ClampTeam(TEAM_SPECTATORS)); } // delete from list tmp = (*v)->prev; -- cgit 1.4.1