Merge branch 'master' into mario/runematch_nuke

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / progs.src

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index ef4bc98cf2143098826be4705eb51e029bf41086..f33be85b9b4c3816451ef7de35efe6492e91800a 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -15,8 +15,8 @@ sys-post.qh
 ../common/constants.qh
 ../common/teams.qh
 ../common/util.qh
+../common/counting.qh
 ../common/items.qh
-../common/deathtypes.qh
 ../common/explosion_equation.qh
 ../common/urllib.qh
 ../common/command/markup.qh
@@ -31,6 +31,7 @@ constants.qh
 defs.qh                // Should rename this, it has fields and globals
 
 ../common/notifications.qh // must be after autocvars
+../common/deathtypes.qh // must be after notifications
 
 mutators/base.qh
 mutators/mutators.qh
@@ -100,7 +101,7 @@ g_subs.qc
 
 g_tetris.qc
 
-runematch.qc
+//runematch.qc
 arena.qc
 
 g_violence.qc