Merge branch 'master' into Mario/qc_stats

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

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

diff --cc qcsrc/common/weapons/all.qc
Simple merge

diff --cc qcsrc/dpdefs/csprogsdefs.qh
index 9756c074585dff755318a9b59c4745c85ff0027a,e7eaf01f3c7104483eefbbaeeef31dadc1b296d7..0b53fb20e5f8063f44ff2db80651de2b7d2d9e30
--- 1/qcsrc/dpdefs/csprogsdefs.qh
--- 2/qcsrc/dpdefs/csprogsdefs.qh
+++ b/qcsrc/dpdefs/csprogsdefs.qh
@@@ -18,15 -18,16 +18,24 @@@
  #define STAT_MOVEVARS_TICRATE _STAT_MOVEVARS_TICRATE
  #define STAT_MOVEVARS_TIMESCALE _STAT_MOVEVARS_TIMESCALE
  #define STAT_MOVEVARS_GRAVITY _STAT_MOVEVARS_GRAVITY
 +#define STAT_HEALTH _STAT_HEALTH
 +#define STAT_ARMOR _STAT_ARMOR
 +#define STAT_SHELLS _STAT_SHELLS
 +#define STAT_NAILS _STAT_NAILS
 +#define STAT_ROCKETS _STAT_ROCKETS
 +#define STAT_CELLS _STAT_CELLS
 +#define STAT_ITEMS _STAT_ITEMS
 +#define STAT_VIEWHEIGHT _STAT_VIEWHEIGHT
  
+ #define drawpic drawpic_builtin
+ #define drawstring drawstring_builtin
+ #define drawcharacter drawcharacter_builtin
+ #define drawfill drawfill_builtin
+ #define drawsetcliparea drawsetcliparea_builtin
+ #define drawcolorcodedstring drawcolorcodedstring_builtin
+ #define drawcolorcodedstring2 drawcolorcodedstring2_builtin
+ #define stringwidth stringwidth_builtin
+ 
  #include "upstream/csprogsdefs.qc"
  
  #undef true