Merge branch 'master' into Mario/strength_stat_field

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

diff --git a/qcsrc/dpdefs/post.qh b/qcsrc/dpdefs/post.qh
index db8752d2bb8075d2f9611c3c776830c6d682540d..70e5f378422af7850a91ec65cf8857d6c61ae0d8 100644 (file)
--- a/qcsrc/dpdefs/post.qh
+++ b/qcsrc/dpdefs/post.qh
@@ -6,11 +6,13 @@
 #undef error
 #undef movetogoal
 #undef objerror
+#undef remove
 #undef walkmove
+#undef setcolor
 
 #ifdef MENUQC
-       #define NULL (0, null_entity)
+       #define NULL (RVALUE, null_entity)
        #define world NULL
 #else
-       #define NULL (0, world)
+       #define NULL (RVALUE, world)
 #endif