Merge branch 'master' into divVerent/csqcmodel

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 3ad4de20c528c97cf48473f2ae2e58066a9279f0..86e22ccde245b5e570d4076f0aab4457dc642d45 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -1,12 +1,10 @@
 ../../progs.dat // output filename
 
 ../common/util-pre.qh
-
-sys.qh
-pre-builtins.qh
-builtins.qh
-extensions.qh
-post-builtins.qh
+sys-pre.qh
+../dpdefs/progsdefs.qc
+../dpdefs/dpextensions.qc
+sys-post.qh
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
@@ -40,6 +38,8 @@ campaign.qh
 
 accuracy.qh
 csqcprojectile.qh
+../csqcmodel/settings.qh
+../csqcmodel/sv_model.qh
 csqceffects.qc
 
 anticheat.qh
@@ -64,6 +64,10 @@ vote.qh
 
 playerdemo.qh
 
+// singleplayer stuff
+item_key.qh
+secret.qh
+
 scores_rules.qc
 
 miscfunctions.qc
@@ -102,6 +106,10 @@ sv_main.qc
 g_triggers.qc
 g_models.qc
 
+// singleplayer stuff
+item_key.qc
+secret.qc
+
 cl_weaponsystem.qc
 w_common.qc
 
@@ -168,12 +176,10 @@ 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
+../csqcmodel/common.qc
+../csqcmodel/sv_model.qc
 csqcprojectile.qc
 
 playerdemo.qc