diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2013-03-24 04:19:57 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2013-03-24 04:19:57 +0100 |
| commit | 4affc155a906b6091aafc3f9635acc3b8b0aed8a (patch) | |
| tree | 43e4dc20b9c36599571f3caf2e9108a4bb3f5401 /src/game/server/player.cpp | |
| parent | 6e73cd75bf24eb98781c68ae47d6527cc03262c8 (diff) | |
| parent | 0914490bd994185caef6bfc3038f5cec737e31f3 (diff) | |
| download | zcatch-4affc155a906b6091aafc3f9635acc3b8b0aed8a.tar.gz zcatch-4affc155a906b6091aafc3f9635acc3b8b0aed8a.zip | |
Merge branch 'master0.6' into zCatch
Conflicts: data/languages/index.txt src/game/server/entities/character.cpp
Diffstat (limited to 'src/game/server/player.cpp')
| -rw-r--r-- | src/game/server/player.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index 993f9182..7e07c07f 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -289,6 +289,7 @@ void CPlayer::SetTeam(int Team, bool DoChatMsg) m_Team = Team; m_LastActionTick = Server()->Tick(); + m_SpectatorID = SPEC_FREEVIEW; // we got to wait 0.5 secs before respawning m_RespawnTick = Server()->Tick()+Server()->TickSpeed()/2; str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' m_Team=%d", m_ClientID, Server()->ClientName(m_ClientID), m_Team); |