From a3545b06b4dd230df8a88a9aa4080d877d78ebab Mon Sep 17 00:00:00 2001 From: oy Date: Mon, 7 Jun 2010 00:08:40 +0200 Subject: some cleanup --- src/game/server/gamecontroller.cpp | 7 +------ src/game/server/player.cpp | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src/game/server') diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index 66d84519..5b7051d3 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -435,13 +435,8 @@ void IGameController::Tick() } } - // move the player to other team without losing his score - // TODO: change in player::set_team needed: player won't lose score on team-change - int ScoreBefore = pP->m_Score; - int ScoreStartTickBefore = pP->m_ScoreStartTick; + // move the player to the other team pP->SetTeam(M^1); - pP->m_Score = ScoreBefore; - pP->m_ScoreStartTick = ScoreStartTickBefore; pP->Respawn(); pP->m_ForceBalanced = true; diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index c295b5d5..2d5d244f 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -158,7 +158,6 @@ void CPlayer::SetTeam(int Team) KillCharacter(); m_Team = Team; - //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); -- cgit 1.4.1