Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/dpdefs/post.qh b/qcsrc/dpdefs/post.qh
index fe465e5933420d7ad602226df27e80c878528202..16fd93450332e44fa0952d7003f6c50fb1fc6b03 100644 (file)
--- a/qcsrc/dpdefs/post.qh
+++ b/qcsrc/dpdefs/post.qh
@@ -1,3 +1,18 @@
 #pragma once
 
+#undef ChangeYaw
+#undef checkclient
+#undef droptofloor
+#undef error
+#undef movetogoal
 #undef objerror
+#undef remove
+#undef walkmove
+#undef setcolor
+
+#ifdef MENUQC
+       #define NULL (0, null_entity)
+       #define world NULL
+#else
+       #define NULL (0, world)
+#endif