Merge branch 'Mario/defs_update' into 'master'

Merge branch Mario/defs_update (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!842

diff --combined qcsrc/dpdefs/csprogsdefs.qh
index 56c51960a3eebba1b2e775a99ee8f1c51acaea10,d4ff5c5e69b29cefca3d9ad9219c248ed9cacd7b..e7eaf01f3c7104483eefbbaeeef31dadc1b296d7
--- 1/qcsrc/dpdefs/csprogsdefs.qh
--- 2/qcsrc/dpdefs/csprogsdefs.qh
+++ b/qcsrc/dpdefs/csprogsdefs.qh
@@@ -19,6 -19,15 +19,15 @@@
  #define STAT_MOVEVARS_TIMESCALE _STAT_MOVEVARS_TIMESCALE
  #define STAT_MOVEVARS_GRAVITY _STAT_MOVEVARS_GRAVITY
  
+ #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
@@@ -40,7 -49,17 +49,16 @@@
  
  #define use use1
  .void(entity this, entity actor, entity trigger) use;
 -#define touch move_touch
  
+ #undef drawpic
+ #undef drawstring
+ #undef drawcharacter
+ #undef drawfill
+ #undef drawsetcliparea
+ #undef drawcolorcodedstring
+ #undef drawcolorcodedstring2
+ #undef stringwidth
+ 
  void(vector ang) _makevectors_hidden = #1;
  vector(float skel, float bonenum) _skel_get_boneabs_hidden = #270;
  void(float skel, float bonenum, vector org) _skel_set_bone_hidden = #271;