From: Mario <mario.mario@y7mail.com>
Date: Thu, 16 Jul 2020 11:18:23 +0000 (+0000)
Subject: Merge branch 'Mario/defs_update' into 'master'
X-Git-Tag: xonotic-v0.8.5~861
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=3646887fc4f0d75d04b689ec11d4e669b6bd4340;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/defs_update' into 'master'

Merge branch Mario/defs_update (XXS merge request)

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

3646887fc4f0d75d04b689ec11d4e669b6bd4340
diff --cc qcsrc/dpdefs/csprogsdefs.qh
index 56c51960a,d4ff5c5e6..e7eaf01f3
--- a/qcsrc/dpdefs/csprogsdefs.qh
+++ b/qcsrc/dpdefs/csprogsdefs.qh
@@@ -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;