Some updates and fixes to nades, new special bonus nades with different powers

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index b8ce21ec2e18825e13500a33a4d7c911cf9e1480..a4e431d143b9cd4d8ce9e0553f5629e43aa7f7f8 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -15,6 +15,7 @@ sys-post.qh
 ../common/constants.qh
 ../common/teams.qh
 ../common/util.qh
+../common/nades.qh
 ../common/test.qh
 ../common/counting.qh
 ../common/items.qh
@@ -26,13 +27,10 @@ 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
 defs.qh                // Should rename this, it has fields and globals
@@ -43,7 +41,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
@@ -59,8 +56,6 @@ mutators/mutator_nades.qh
 tturrets/include/turrets_early.qh
 vehicles/vehicles_def.qh
 
-generator.qh
-
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
@@ -214,14 +209,14 @@ spawnpoints.qc
 
 portals.qc
 
-generator.qc
-
 target_spawn.qc
 func_breakable.qc
 target_music.qc
 
 ../common/items.qc
 
+../common/nades.qc
+
 
 accuracy.qc
 ../csqcmodellib/sv_model.qc
@@ -238,14 +233,12 @@ round_handler.qc
 ../common/explosion_equation.qc
 
 ../common/monsters/sv_monsters.qc
-../common/monsters/config.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
@@ -287,5 +280,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