diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-10 20:53:37 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-10 20:53:37 +0000 |
| commit | 64c9966ca0d6d450d8e0a88789742f1d5ecfde09 (patch) | |
| tree | 1c9271b510f8f8df8f729f89b6a0921edb513e41 /src/game/server/game_server.cpp | |
| parent | 578aa5f744dfa59b4120125318338ffb5f5e2717 (diff) | |
| download | zcatch-64c9966ca0d6d450d8e0a88789742f1d5ecfde09.tar.gz zcatch-64c9966ca0d6d450d8e0a88789742f1d5ecfde09.zip | |
added option for teamdamage
Diffstat (limited to 'src/game/server/game_server.cpp')
| -rw-r--r-- | src/game/server/game_server.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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) |