From: Mario Date: Sat, 25 Jul 2020 05:09:00 +0000 (+1000) Subject: Merge branch 'master' into Mario/qc_stats X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4247727e85005eee923c6c3b3b3c25b58a94c42d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/qc_stats --- 4247727e85005eee923c6c3b3b3c25b58a94c42d diff --cc qcsrc/dpdefs/csprogsdefs.qh index 9756c0745,e7eaf01f3..0b53fb20e --- a/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