diff options
| author | Olle Rosenquist <phobos99@gmail.com> | 2007-07-22 12:32:57 +0000 |
|---|---|---|
| committer | Olle Rosenquist <phobos99@gmail.com> | 2007-07-22 12:32:57 +0000 |
| commit | 834f9dbd105502efd448d7cf82b96011807d1a8f (patch) | |
| tree | 3191d1b059ccf370f1aabb4016b851d97894d1f0 /src/game | |
| parent | 4b51139425eab3f1734fcf53de45caba8c15a703 (diff) | |
| download | zcatch-834f9dbd105502efd448d7cf82b96011807d1a8f.tar.gz zcatch-834f9dbd105502efd448d7cf82b96011807d1a8f.zip | |
No friendly fire in tdm
Diffstat (limited to 'src/game')
| -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 fc8718fb..9ca153fd 100644 --- a/src/game/server/game_server.cpp +++ b/src/game/server/game_server.cpp @@ -1221,6 +1221,9 @@ bool player::take_damage(vec2 force, int dmg, int from, int weapon) // create healthmod indicator create_damageind(pos, normalize(force), dmg); + if (gameobj.gametype == GAMETYPE_TDM && from >= 0 && players[from].team == team) + return false; + if(armor) { armor -= 1; |