Merge branch 'master' into terencehill/lms_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / dpdefs / csprogsdefs.qh

diff --git a/qcsrc/dpdefs/csprogsdefs.qh b/qcsrc/dpdefs/csprogsdefs.qh
index 6ad27242aaf3f6a22161d17db4f4e3bd44d3575a..e7eaf01f3c7104483eefbbaeeef31dadc1b296d7 100644 (file)
--- a/qcsrc/dpdefs/csprogsdefs.qh
+++ b/qcsrc/dpdefs/csprogsdefs.qh
@@ -1,5 +1,4 @@
-#ifndef CSPROGSDEFS_H
-#define CSPROGSDEFS_H
+#pragma once
 
 #pragma noref 1
 
@@ -10,8 +9,25 @@
 
 #define spawn _spawn
 #define particleeffectnum _particleeffectnum
+#define trailparticles __trailparticles
+#define pointparticles __pointparticles
 #define setmodel _setmodel
 
+#define STAT_FRAGLIMIT _STAT_FRAGLIMIT
+#define STAT_TIMELIMIT _STAT_TIMELIMIT
+#define STAT_MOVEVARS_TICRATE _STAT_MOVEVARS_TICRATE
+#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
@@ -21,10 +37,33 @@
 
 #undef spawn
 #undef particleeffectnum
+#undef trailparticles
+#undef pointparticles
 #undef setmodel
 
-#pragma noref 0
+#undef STAT_FRAGLIMIT
+#undef STAT_TIMELIMIT
+#undef STAT_MOVEVARS_TICRATE
+#undef STAT_MOVEVARS_TIMESCALE
+#undef STAT_MOVEVARS_GRAVITY
 
-#define ReadFloat() ReadCoord()
+#define use use1
+.void(entity this, entity actor, entity trigger) use;
 
-#endif
+#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;
+void(vector org, float radius, vector lightcolours) _adddynamiclight_hidden = #305;
+void(vector dir) _vectorvectors_hidden = #432;
+vector(entity ent, float tagindex) _gettaginfo_hidden = #452;
+
+#pragma noref 0