Merge branch 'Mario/defs_update' into 'master'
authorMario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 11:18:23 +0000 (11:18 +0000)
committerMario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 11:18:23 +0000 (11:18 +0000)
Merge branch Mario/defs_update (XXS merge request)

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

1  2 
qcsrc/dpdefs/csprogsdefs.qh

  
  #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;