edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 17:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1089 from Teetime/tdmfix

Browse source 
Fixed a missing check if killer is alive in tdm
This commit is contained in:
oy 2013-04-26 07:49:08 -07:00
parent 9b81779ae3 61671f3bcd
commit 1200b9e758
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/server/gamemodes/tdm.cpp
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())