Merge remote branch 'origin/master' into samual/updatecommands

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index c78b9f2fa5908c650ba76fd71cb0298146764599..aac9072c52e2bfc3df56d8d36a1542ec9e1e4f35 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -1,12 +1,11 @@
 ../../progs.dat // output filename
 
-../common/util-pre.qh
+sys-pre.qh
+../dpdefs/progsdefs.qc
+../dpdefs/dpextensions.qc
+sys-post.qh
 
-sys.qh
-pre-builtins.qh
-builtins.qh
-extensions.qh
-post-builtins.qh
+../common/util-pre.qh
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
@@ -64,6 +63,10 @@ vote.qh
 
 playerdemo.qh
 
+// singleplayer stuff
+item_key.qh
+secret.qh
+
 scores_rules.qc
 
 miscfunctions.qc
@@ -102,6 +105,10 @@ sv_main.qc
 g_triggers.qc
 g_models.qc
 
+// singleplayer stuff
+item_key.qc
+secret.qc
+
 cl_weaponsystem.qc
 w_common.qc
 
@@ -138,6 +145,8 @@ campaign.qc
 ../common/gamecommand.qc
 gamecommand.qc
 
+radarmap.qc
+
 assault.qc
 
 ipban.qc
@@ -168,11 +177,7 @@ target_music.qc
 
 ../common/items.qc
 
-monsters/defs.qc
-monsters/fight.qc
-monsters/ai.qc
-monsters/m_monsters.qc
-monsters/monster_zombie.qc
+
 accuracy.qc
 csqcprojectile.qc
 
@@ -188,6 +193,7 @@ mutators/base.qc
 mutators/gamemode_keyhunt.qc
 mutators/gamemode_freezetag.qc
 mutators/gamemode_keepaway.qc
+mutators/mutator_invincibleproj.qc
 mutators/mutator_nix.qc
 mutators/mutator_dodging.qc
 mutators/mutator_rocketflying.qc