Merge branch 'master' into Mario/ctf_updates

Conflicts:
	qcsrc/client/hud.qc

diff --cc qcsrc/client/hud.qc
index 15cc1176087b2485502ff45924ea2dab166822bb,b61fe2a5da685f95d66b3a766fdaded8d63cf2ca..33158820050a2d46ed4e50fd03f592fc0fc7dac0
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -1,12 -1,24 +1,27 @@@
+ #include "hud.qh"
+ #include "_all.qh"
+ 
+ #include "hud_config.qh"
  #include "scoreboard.qh"
+ #include "sortlist.qh"
  #include "teamradar.qh"
+ #include "t_items.qh"
+ 
  #include "../common/buffs.qh"
+ #include "../common/constants.qh"
  #include "../common/counting.qh"
+ #include "../common/deathtypes.qh"
  #include "../common/mapinfo.qh"
  #include "../common/nades.qh"
- #include "../server/t_items.qh"
++
 +#include "../server/mutators/gamemode_ctf.qh"
 +
+ #include "../common/stats.qh"
+ 
+ #include "../csqcmodellib/cl_player.qh"
+ 
+ #include "../warpzonelib/mathlib.qh"
+ 
  /*
  ==================
  Misc HUD functions

diff --cc qcsrc/client/waypointsprites.qc
Simple merge

diff --cc qcsrc/common/notifications.qh
Simple merge

diff --cc qcsrc/common/stats.qh
Simple merge

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
Simple merge

diff --cc qcsrc/server/mutators/gamemode_ctf.qh
index d2572bc458896ef24159bc9ada697496ed6424aa,302f6ce104b305054a8f3dd36830a5a3b8200025..3cac4bd41fa9e5daef74663370fe55cc33138951
--- 1/qcsrc/server/mutators/gamemode_ctf.qh
--- 2/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@@ -74,31 -71,33 +74,33 @@@ bool wpforenemy_announced
  float wpforenemy_nextthink;
  
  // statuses
 -const float FLAG_BASE = 1;
 -const float FLAG_DROPPED = 2;
 -const float FLAG_CARRY = 3;
 -const float FLAG_PASSING = 4;
 +const int FLAG_BASE = 1;
 +const int FLAG_DROPPED = 2;
 +const int FLAG_CARRY = 3;
 +const int FLAG_PASSING = 4;
  
 -const float DROP_NORMAL = 1;
 -const float DROP_THROW = 2;
 -const float DROP_PASS = 3;
 -const float DROP_RESET = 4;
 +const int DROP_NORMAL = 1;
 +const int DROP_THROW = 2;
 +const int DROP_PASS = 3;
 +const int DROP_RESET = 4;
  
 -const float PICKUP_BASE = 1;
 -const float PICKUP_DROPPED = 2;
 +const int PICKUP_BASE = 1;
 +const int PICKUP_DROPPED = 2;
  
 -const float CAPTURE_NORMAL = 1;
 -const float CAPTURE_DROPPED = 2;
 +const int CAPTURE_NORMAL = 1;
 +const int CAPTURE_DROPPED = 2;
  
 -const float RETURN_TIMEOUT = 1;
 -const float RETURN_DROPPED = 2;
 -const float RETURN_DAMAGE = 3;
 -const float RETURN_SPEEDRUN = 4;
 -const float RETURN_NEEDKILL = 5;
 +const int RETURN_TIMEOUT = 1;
 +const int RETURN_DROPPED = 2;
 +const int RETURN_DAMAGE = 3;
 +const int RETURN_SPEEDRUN = 4;
 +const int RETURN_NEEDKILL = 5;
  
+ void ctf_Handle_Throw(entity player, entity receiver, float droptype);
+ 
  // flag properties
  #define ctf_spawnorigin dropped_origin
 -float ctf_stalemate; // indicates that a stalemate is active
 +bool ctf_stalemate; // indicates that a stalemate is active
  float ctf_captimerecord; // record time for capturing the flag
  .float ctf_pickuptime;
  .float ctf_droptime;