about summary refs log tree commit diff
path: root/src/game/server
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2009-01-11 14:16:49 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2009-01-11 14:16:49 +0000
commit172463b2bb49608d6b347ffbd67c0bd55ca8a692 (patch)
treecc27cd3983d12c77662041b331711f3530c835f3 /src/game/server
parentc2c90982fd2c9b1d0f804872da3496d1c76d9c5e (diff)
downloadzcatch-172463b2bb49608d6b347ffbd67c0bd55ca8a692.tar.gz
zcatch-172463b2bb49608d6b347ffbd67c0bd55ca8a692.zip
fixed so your team gets -1 if you kill yourself. drawback, team looses one point when you switch team as well. good enough for now
Diffstat (limited to 'src/game/server')
-rw-r--r--src/game/server/gamemodes/tdm.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/game/server/gamemodes/tdm.cpp b/src/game/server/gamemodes/tdm.cpp
index c15fb244..e9aa0cdd 100644
--- a/src/game/server/gamemodes/tdm.cpp
+++ b/src/game/server/gamemodes/tdm.cpp
@@ -14,14 +14,12 @@ int GAMECONTROLLER_TDM::on_character_death(class CHARACTER *victim, class PLAYER
 {
 	GAMECONTROLLER::on_character_death(victim, killer, weapon);
 	
-	if(weapon >= 0)
-	{
-		// do team scoring
-		if(killer == victim->player || killer->team == victim->player->team)
-			teamscore[killer->team&1]--; // klant arschel
-		else
-			teamscore[killer->team&1]++; // good shit
-	}
+	// do team scoring
+	if(killer == victim->player || killer->team == victim->player->team)
+		teamscore[killer->team&1]--; // klant arschel
+	else
+		teamscore[killer->team&1]++; // good shit
+		
 	return 0;
 }