about summary refs log tree commit diff
path: root/src/game/server/gamecontroller.cpp
diff options
context:
space:
mode:
authorxalduin <xalduin@gmail.com>2010-06-03 17:08:05 -0400
committerxalduin <xalduin@gmail.com>2010-06-03 17:08:05 -0400
commit9603d676c67af12294e9598cb8be68fbfafc78e7 (patch)
tree251e61356d3fcf51a39d19771884ada21e390e5e /src/game/server/gamecontroller.cpp
parent825e732c87a5f57ef2f4d9bd9ad5e398a81d3ae2 (diff)
downloadzcatch-9603d676c67af12294e9598cb8be68fbfafc78e7.tar.gz
zcatch-9603d676c67af12294e9598cb8be68fbfafc78e7.zip
Score no longer decreased when switching teams
Diffstat (limited to 'src/game/server/gamecontroller.cpp')
-rw-r--r--src/game/server/gamecontroller.cpp2
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