diff options
| author | xalduin <xalduin@gmail.com> | 2010-06-03 17:08:05 -0400 |
|---|---|---|
| committer | xalduin <xalduin@gmail.com> | 2010-06-03 17:08:05 -0400 |
| commit | 9603d676c67af12294e9598cb8be68fbfafc78e7 (patch) | |
| tree | 251e61356d3fcf51a39d19771884ada21e390e5e /src/game | |
| parent | 825e732c87a5f57ef2f4d9bd9ad5e398a81d3ae2 (diff) | |
| download | zcatch-9603d676c67af12294e9598cb8be68fbfafc78e7.tar.gz zcatch-9603d676c67af12294e9598cb8be68fbfafc78e7.zip | |
Score no longer decreased when switching teams
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/server/gamecontroller.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/player.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index 519a28ae..66d84519 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -308,7 +308,7 @@ void IGameController::OnPlayerInfoChange(class CPlayer *pP) int IGameController::OnCharacterDeath(class CCharacter *pVictim, class CPlayer *pKiller, int Weapon) { // do scoreing - if(!pKiller) + if(!pKiller || Weapon == WEAPON_GAME) return 0; if(pKiller == pVictim->GetPlayer()) pVictim->GetPlayer()->m_Score--; // suicide diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index 354b8118..c295b5d5 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -156,8 +156,6 @@ void CPlayer::SetTeam(int Team) GameServer()->SendChat(-1, CGameContext::CHAT_ALL, Buf); KillCharacter(); - if( m_Team != -1 ) // Give a point to make up for killing character, but not if they're a spectator - m_Score += 1; m_Team = Team; //m_ScoreStartTick = Server()->Tick(); |