From e13cb835f6e02aec2198a4c30bdbde7f47f12985 Mon Sep 17 00:00:00 2001
From: Teetime <anton.tsoulos@yahoo.de>
Date: Fri, 14 Oct 2011 16:39:22 +0200
Subject: changed scoring a bit

---
 src/game/server/gamemodes/zcatch.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/game/server')

diff --git a/src/game/server/gamemodes/zcatch.cpp b/src/game/server/gamemodes/zcatch.cpp
index 2c9370e4..a112ac04 100644
--- a/src/game/server/gamemodes/zcatch.cpp
+++ b/src/game/server/gamemodes/zcatch.cpp
@@ -2,10 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 /* zCatch by erd and Teetime */
 
-#include <engine/server.h>
 #include <engine/shared/config.h>
-#include <game/server/entities/character.h>
-#include <game/server/player.h>
 #include <game/server/gamecontext.h>
 #include "zcatch.hpp"
 
@@ -69,6 +66,7 @@ int CGameController_zCatch::OnCharacterDeath(class CCharacter *pVictim, class CP
 		pVictim->GetPlayer()->m_Deaths++; 
 		
 		pKiller->m_Score++;
+		pVictim->GetPlayer()->m_Score--;
 		
 		/* Check if the killer is already killed and in spectator (victim may died through wallshot) */
 		if(pKiller->GetTeam() != TEAM_SPECTATORS)
@@ -83,6 +81,12 @@ int CGameController_zCatch::OnCharacterDeath(class CCharacter *pVictim, class CP
 			GameServer()->SendChatTarget(VictimID, buf);
 		}
 	}
+	else
+	{
+		//Punish selfkill/death
+		if(WeaponID == WEAPON_SELF || WeaponID == WEAPON_WORLD)
+			pVictim->GetPlayer()->m_Score -= 15;
+	}
 	
 	for(int i=0; i < MAX_CLIENTS; i++)
 	{
-- 
cgit 1.4.1