Merge pull request #1089 from Teetime/tdmfix

Fixed a missing check if killer is alive in tdm
This commit is contained in:
oy 2013-04-26 07:49:08 -07:00
commit 1200b9e758

View file

@ -17,7 +17,7 @@ int CGameControllerTDM::OnCharacterDeath(class CCharacter *pVictim, class CPlaye
IGameController::OnCharacterDeath(pVictim, pKiller, Weapon);
if(Weapon != WEAPON_GAME)
if(pKiller && Weapon != WEAPON_GAME)
{
// do team scoring
if(pKiller == pVictim->GetPlayer() || pKiller->GetTeam() == pVictim->GetPlayer()->GetTeam())