Merge branch 'master' into Lyberta/TeamplayOverhaul2
authorLyberta <lyberta@lyberta.net>
Fri, 17 Aug 2018 22:36:10 +0000 (01:36 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 17 Aug 2018 22:36:10 +0000 (01:36 +0300)
1  2 
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
@@@ -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)