Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index d446d1bd3cf68b4a8df4427694c18b8dc3e3b292..68f465cc0da506959a4b8fda5a9563262764ea65 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -27,6 +27,12 @@ sys-post.qh
 ../common/net_notice.qh
 ../common/animdecide.qh
 
+../common/monsters/config.qh
+../common/monsters/monsters.qh
+../common/monsters/sv_monsters.qh
+../common/monsters/spawn.qh
+
+
 autocvars.qh
 constants.qh
 defs.qh                // Should rename this, it has fields and globals
@@ -53,10 +59,6 @@ mutators/mutator_nades.qh
 tturrets/include/turrets_early.qh
 vehicles/vehicles_def.qh
 
-monsters/lib/monsters_early.qh
-
-generator.qh
-
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
@@ -210,8 +212,6 @@ spawnpoints.qc
 
 portals.qc
 
-generator.qc
-
 target_spawn.qc
 func_breakable.qc
 target_music.qc
@@ -233,7 +233,11 @@ round_handler.qc
 
 ../common/explosion_equation.qc
 
-monsters/monsters.qh
+../common/monsters/sv_monsters.qc
+../common/monsters/config.qc
+../common/monsters/monsters.qc
+
+../common/monsters/spawn.qc
 
 mutators/base.qc
 mutators/gamemode_assault.qc
@@ -279,5 +283,3 @@ mutators/mutator_campcheck.qc
 ../common/test.qc
 ../common/util.qc
 ../common/notifications.qc
-
-../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail