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/gamecontroller.cpp | |
| parent | 34bd0a09b7b57fb83f7cc44ea880387538102bf4 (diff) | |
| parent | 04b6abae93c809efeeb4f6b2e9d8eb80a48b1686 (diff) | |
| download | zcatch-7cc7c8f84eba9d9c103e6cc393da9c0fab41cf16.tar.gz zcatch-7cc7c8f84eba9d9c103e6cc393da9c0fab41cf16.zip | |
Merged with 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 |