Merge branch 'master' into TimePath/deathtypes

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

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 05704e5cb4e4eaa4502a4ed010595476dea6a664..c641bf61e0f5911d78310e943b9922e5a321b972 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -20,7 +20,7 @@
 #include "t_items.qh"
 #include "wall.qh"
 #include "weapons/projectile.qh"
-#include "../common/deathtypes.qh"
+#include "../common/deathtypes/all.qh"
 #include "../common/items/all.qh"
 #include "../common/mapinfo.qh"
 #include "../common/minigames/cl_minigames.qh"
@@ -130,7 +130,6 @@ void CSQC_Init(void)
 
        // needs to be done so early because of the constants they create
        static_init();
-       CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 
        // precaches