Merge branch 'master' into terencehill/menu_hudskin_selector

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

diff --git a/qcsrc/dpdefs/menudefs.qh b/qcsrc/dpdefs/menudefs.qh
index dce99cde598cbba758d4c3cb36fdc3db325a66ba..c0e6d3ba728e738b5cc7f431e2025501df0278e4 100644 (file)
--- a/qcsrc/dpdefs/menudefs.qh
+++ b/qcsrc/dpdefs/menudefs.qh
@@ -8,6 +8,8 @@
 #define TRUE _TRUE
 #define FALSE _FALSE
 
+#define spawn _spawn
+
 #include "upstream/menudefs.qc"
 
 #undef true
@@ -15,6 +17,10 @@
 #undef TRUE
 #undef FALSE
 
+#undef spawn
+
+#define localcmd cmd
+
 int(string str, string sub, int startpos) _strstrofs = #221;
 #define strstrofs _strstrofs
 int(string str, int ofs) _str2chr = #222;