Merge branch 'master' into terencehill/accelerometer_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / damage.qc

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 112b1ad8dad31a6c828bc3fd66a958b7fbf5ec25..39c422e1cca700cabe13953c50af3c7234bcbc40 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -1,19 +1,17 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../common/constants.qh"
-       #include "../common/util.qh"
-       #include "../common/deathtypes.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "vehicles/vehicles.qh"
-       #include "autocvars.qh"
-       #include "defs.qh"
-       #include "damage.qh"
-       #include "gibs.qh"
-       #include "movetypes.qh"
-       #include "prandom.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "damage.qh"
+#include "_all.qh"
+
+#include "gibs.qh"
+#include "movetypes.qh"
+#include "prandom.qh"
+
+#include "vehicles/all.qh"
+
+#include "../common/constants.qh"
+#include "../common/deathtypes.qh"
+#include "../common/util.qh"
+
+#include "../common/weapons/all.qh"
 
 .entity tag_entity;