diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-06 14:44:32 +0200 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-06 14:44:32 +0200 |
| commit | 4ca43196d7e56fa155625c95ff33ad31ad3651b7 (patch) | |
| tree | 5d964ce68fe1bc1ebe6328cad9bc9ae18157b0b9 /src/game/server/gamecontroller.cpp | |
| parent | b37be77dcb04836a1bebe830dc707777d580da4f (diff) | |
| parent | 2d99a0360fa4ca08525c93ba81469fb2b4cc7e72 (diff) | |
| download | zcatch-4ca43196d7e56fa155625c95ff33ad31ad3651b7.tar.gz zcatch-4ca43196d7e56fa155625c95ff33ad31ad3651b7.zip | |
Merge remote branch 'xalduin/master'
Diffstat (limited to 'src/game/server/gamecontroller.cpp')
| -rw-r--r-- | src/game/server/gamecontroller.cpp | 2 |
1 files changed, 1 insertions, 1 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 |