Merge branch 'terencehill/menu_fixes' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / _all.inc

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index 97483b518f459c7d96752d7c0b73868def0285db..307b4bd081c6f35cbbfe75eb87925bdd0f44ac2c 100644 (file)
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -13,21 +13,24 @@
 #endif
 
 #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../dpdefs/keycodes.qh"
+       #include <dpdefs/csprogsdefs.qh>
+       #include <dpdefs/keycodes.qh>
 #elif defined(SVQC)
-       #include "../server/sys-pre.qh"
-       #include "../dpdefs/progsdefs.qh"
-       #include "../dpdefs/dpextensions.qh"
-       #include "../server/sys-post.qh"
+       #include <server/sys-pre.qh>
+       #include <dpdefs/progsdefs.qh>
+       #include <dpdefs/dpextensions.qh>
+       #include <server/sys-post.qh>
 #elif defined(MENUQC)
-       #include "../dpdefs/menudefs.qh"
-       #include "../dpdefs/keycodes.qh"
+       #include <dpdefs/menudefs.qh>
+       #include <dpdefs/keycodes.qh>
 #endif
 
+#include "macro.qh"
+
 #include "warpzone/mathlib.qc"
 
 #include "accumulate.qh"
+#include "angle.qc"
 #include "arraylist.qh"
 #include "bits.qh"
 #include "bool.qh"
@@ -36,6 +39,7 @@
 #include "cvar.qh"
 #include "defer.qh"
 #include "draw.qh"
+#include "enumclass.qh"
 #include "file.qh"
 #include "functional.qh"
 #include "i18n.qh"
@@ -44,15 +48,14 @@
 #include "lazy.qh"
 #include "linkedlist.qh"
 #include "log.qh"
-#include "map.qc"
+#include "map.qh"
 #include "math.qh"
 #include "misc.qh"
 #include "net.qh"
 #include "nil.qh"
-#include "noise.qc"
+#include "noise.qh"
 #include "oo.qh"
 #include "p2mathlib.qc"
-#include "player.qh"
 #include "progname.qh"
 #include "random.qc"
 #include "registry.qh"
@@ -67,5 +70,7 @@
 #include "string.qh"
 #include "struct.qh"
 #include "test.qc"
+#include "unsafe.qh"
 #include "urllib.qc"
 #include "vector.qh"
+#include "yenc.qh"