From 64c9966ca0d6d450d8e0a88789742f1d5ecfde09 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 10 Dec 2007 20:53:37 +0000 Subject: added option for teamdamage --- src/game/server/game_server.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/game/server/game_server.cpp') diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp index 96183457..c146d5c4 100644 --- a/src/game/server/game_server.cpp +++ b/src/game/server/game_server.cpp @@ -1064,6 +1064,9 @@ void player::die(int killer, int weapon) bool player::take_damage(vec2 force, int dmg, int from, int weapon) { core.vel += force; + + if(gameobj->is_friendly_fire(client_id, from) && !config.sv_teamdamage) + return false; // player only inflicts half damage on self if(from == client_id) -- cgit 1.4.1