diff options
| author | Fujnky <larsfunke1996@gmail.com> | 2010-06-07 16:00:01 +0200 |
|---|---|---|
| committer | Fujnky <larsfunke1996@gmail.com> | 2010-06-07 16:00:01 +0200 |
| commit | 7cc7c8f84eba9d9c103e6cc393da9c0fab41cf16 (patch) | |
| tree | 4a308559ece64a7c90328432fd3956021ffb2e3d /src/game/server/player.cpp | |
| parent | 34bd0a09b7b57fb83f7cc44ea880387538102bf4 (diff) | |
| parent | 04b6abae93c809efeeb4f6b2e9d8eb80a48b1686 (diff) | |
| download | zcatch-7cc7c8f84eba9d9c103e6cc393da9c0fab41cf16.tar.gz zcatch-7cc7c8f84eba9d9c103e6cc393da9c0fab41cf16.zip | |
Merged with master
Diffstat (limited to 'src/game/server/player.cpp')
| -rw-r--r-- | src/game/server/player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index 8e58b7c1..c295b5d5 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -156,9 +156,9 @@ void CPlayer::SetTeam(int Team) GameServer()->SendChat(-1, CGameContext::CHAT_ALL, Buf); KillCharacter(); + m_Team = Team; - m_Score = 0; - m_ScoreStartTick = Server()->Tick(); + //m_ScoreStartTick = Server()->Tick(); // we got to wait 0.5 secs before respawning m_RespawnTick = Server()->Tick()+Server()->TickSpeed()/2; dbg_msg("game", "team_join player='%d:%s' m_Team=%d", m_ClientID, Server()->ClientName(m_ClientID), m_Team); |