From: Lyberta <lyberta@lyberta.net>
Date: Fri, 17 Aug 2018 22:36:10 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul2
X-Git-Tag: xonotic-v0.8.5~1899^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=677328b0b1e53bdd5868d5020d2f7e52cf8c2d42;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/TeamplayOverhaul2
---

677328b0b1e53bdd5868d5020d2f7e52cf8c2d42
diff --cc qcsrc/server/defs.qh
index 908d99444,3aed06ee4..f1299bf30
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -354,7 -354,9 +354,7 @@@ const int ACTIVE_TOGGLE 	= 3
  
  //float serverflags;
  
- .float player_blocked;
 -.int team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator
 -
+ .bool player_blocked;
  
  .float revival_time; // time at which player was last revived
  .float revive_speed; // NOTE: multiplier (anything above 1 is instaheal)