Merge branch 'master' into Mario/overkill

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 32b61aac0785b4e260aa8f2d4ed9c0851d2a4d20..d605a7e7e3f90002e9d777c1ad628a531ad09960 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -26,10 +26,9 @@ sys-post.qh
 ../common/command/shared_defs.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
@@ -41,7 +40,6 @@ defs.qh               // Should rename this, it has fields and globals
 mutators/base.qh
 mutators/mutators.qh
 mutators/gamemode_assault.qh
-mutators/gamemode_arena.qh
 mutators/gamemode_ca.qh
 mutators/gamemode_ctf.qh
 mutators/gamemode_domination.qh
@@ -52,15 +50,12 @@ mutators/gamemode_lms.qh
 mutators/gamemode_invasion.qh
 mutators/mutator_dodging.qh
 mutators/mutator_nades.qh
+mutators/mutator_overkill.qh
 
 //// tZork Turrets ////
 tturrets/include/turrets_early.qh
 vehicles/vehicles_def.qh
 
-../common/monsters/lib/monsters_early.qh
-
-generator.qh
-
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
@@ -214,8 +209,6 @@ spawnpoints.qc
 
 portals.qc
 
-generator.qc
-
 target_spawn.qc
 func_breakable.qc
 target_music.qc
@@ -237,12 +230,13 @@ round_handler.qc
 
 ../common/explosion_equation.qc
 
-../common/monsters/config.qc
+../common/monsters/sv_monsters.qc
 ../common/monsters/monsters.qc
 
+../common/monsters/spawn.qc
+
 mutators/base.qc
 mutators/gamemode_assault.qc
-mutators/gamemode_arena.qc
 mutators/gamemode_ca.qc
 mutators/gamemode_ctf.qc
 mutators/gamemode_domination.qc
@@ -259,6 +253,7 @@ mutators/mutator_nix.qc
 mutators/mutator_dodging.qc
 mutators/mutator_rocketflying.qc
 mutators/mutator_vampire.qc
+mutators/mutator_overkill.qc
 mutators/mutator_spawn_near_teammate.qc
 mutators/mutator_physical_items.qc
 mutators/sandbox.qc
@@ -284,5 +279,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