Create separate file for deathtype declarations, move common macros to

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index f3bcc06850eaf8ffac6dc76eddbf0f28323e2b12..e78c3d979704d3c9e8258c5b0cac9044c6f0f3ea 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
@@ -17,8 +15,14 @@ post-builtins.qh
 ../common/constants.qh
 ../common/util.qh
 ../common/items.qh
+../common/deathtypes.qh
 ../common/explosion_equation.qh
 ../common/urllib.qh
+../common/command/markup.qh
+../common/command/rpn.qh
+../common/command/generic.qh
+../common/command/shared_defs.qh
+../common/net_notice.qh
 
 autocvars.qh
 constants.qh
@@ -26,7 +30,10 @@ defs.qh              // Should rename this, it has fields and globals
 
 mutators/base.qh
 mutators/mutators.qh
+mutators/gamemode_ctf.qh
 mutators/gamemode_keyhunt.qh // TODO fix this
+mutators/gamemode_keepaway.qh
+mutators/gamemode_nexball.qh 
 mutators/mutator_dodging.qh
 
 //// tZork Turrets ////
@@ -36,11 +43,20 @@ vehicles/vehicles_def.qh
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
-../common/util.qc
+
+command/common.qh
+command/banning.qh
+command/radarmap.qh
+command/vote.qh
+command/getreplies.qh
+command/cmd.qh
+command/sv_cmd.qh
 
 accuracy.qh
 csqcprojectile.qh
-csqcmodel.qh
+../common/csqcmodel_settings.qh
+../csqcmodellib/common.qh
+../csqcmodellib/sv_model.qh
 csqceffects.qc
 
 anticheat.qh
@@ -61,8 +77,6 @@ race.qh
 
 antilag.qh
 
-vote.qh
-
 playerdemo.qh
 
 // singleplayer stuff
@@ -73,6 +87,8 @@ scores_rules.qc
 
 miscfunctions.qc
 
+../common/notifications.qc
+
 waypointsprites.qc
 
 bot/bot.qc
@@ -127,25 +143,31 @@ cl_client.qc
 t_plats.qc
 antilag.qc
 
-ctf.qc
+//ctf.qc
 domination.qc
-mode_onslaught.qc
-nexball.qc
+//mode_onslaught.qc
+//nexball.qc
 g_hook.qc
 
 t_swamp.qc
 
-clientcommands.qc
-
-vote.qc
-
 campaign.qc
 ../common/campaign_file.qc
 ../common/campaign_setup.qc
 ../common/urllib.qc
 
-../common/gamecommand.qc
-gamecommand.qc
+../common/command/markup.qc
+../common/command/rpn.qc
+../common/command/generic.qc
+../common/net_notice.qc
+
+command/common.qc
+command/banning.qc
+command/radarmap.qc
+command/vote.qc
+command/getreplies.qc
+command/cmd.qc
+command/sv_cmd.qc
 
 assault.qc
 
@@ -153,9 +175,6 @@ ipban.qc
 
 ../common/mapinfo.qc
 
-
-
-
 t_quake3.qc
 t_halflife.qc
 t_quake.qc
@@ -179,7 +198,7 @@ target_music.qc
 
 
 accuracy.qc
-csqcmodel.qc
+../csqcmodellib/sv_model.qc
 csqcprojectile.qc
 
 playerdemo.qc
@@ -191,14 +210,21 @@ playerstats.qc
 ../common/explosion_equation.qc
 
 mutators/base.qc
-mutators/gamemode_keyhunt.qc
+mutators/gamemode_ctf.qc
 mutators/gamemode_freezetag.qc
+mutators/gamemode_keyhunt.qc
 mutators/gamemode_keepaway.qc
+mutators/gamemode_nexball.qc
+mutators/gamemode_onslaught.qc
 mutators/mutator_invincibleproj.qc
+mutators/mutator_new_toys.qc
 mutators/mutator_nix.qc
 mutators/mutator_dodging.qc
 mutators/mutator_rocketflying.qc
 mutators/mutator_vampire.qc
+mutators/mutator_spawn_near_teammate.qc
+mutators/sandbox.qc
+mutators/mutator_superspec.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
@@ -206,4 +232,6 @@ mutators/mutator_vampire.qc
 ../warpzonelib/util_server.qc
 ../warpzonelib/server.qc
 
+../common/util.qc
+
 ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail