Merge branch 'master' into Mario/entrap_nade

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

diff --git a/qcsrc/dpdefs/progsdefs.qh b/qcsrc/dpdefs/progsdefs.qh
index c2440d3dabffba98aaf3a1324d321267a224dd46..e2668a54b7cc5173d2aad78b1b4681f0a54fbc30 100644 (file)
--- a/qcsrc/dpdefs/progsdefs.qh
+++ b/qcsrc/dpdefs/progsdefs.qh
@@ -9,6 +9,7 @@
 #define FALSE _FALSE
 
 #define spawn _spawn
+#define setmodel _setmodel
 
 #include "upstream/progsdefs.qc"
 
@@ -18,7 +19,16 @@
 #undef FALSE
 
 #undef spawn
+#undef setmodel
+
+#define stuffcmd(cl, ...) MACRO_BEGIN \
+    entity _cl = (cl); \
+    if (IS_REAL_CLIENT(_cl)) stuffcmd(_cl, __VA_ARGS__); \
+MACRO_END
 
 #pragma noref 0
 
+#define use use1
+.void(entity this, entity actor, entity trigger) use;
+
 #endif