Merge remote branch 'origin/master' into samual/mutator_ctf

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index d99b078914064985910b36b9334620b100fd5303..0ebe6d9fb5aaabd606c88b3c31e0f9cd0688dd95 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -17,6 +17,8 @@ sys-post.qh
 ../common/items.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
 
@@ -26,6 +28,7 @@ defs.qh               // Should rename this, it has fields and globals
 
 mutators/base.qh
 mutators/mutators.qh
+mutators/gamemode_ctf.qh // for spawnfuncs
 mutators/gamemode_keyhunt.qh // TODO fix this
 mutators/mutator_dodging.qh
 
@@ -38,9 +41,10 @@ campaign.qh
 ../common/mapinfo.qh
 
 command/common.qh
-command/ipban.qh
+command/banning.qh
 command/radarmap.qh
 command/vote.qh
+command/getreplies.qh
 command/cmd.qh
 command/sv_cmd.qh
 
@@ -133,7 +137,7 @@ cl_client.qc
 t_plats.qc
 antilag.qc
 
-ctf.qc
+//ctf.qc
 domination.qc
 mode_onslaught.qc
 nexball.qc
@@ -146,11 +150,14 @@ campaign.qc
 ../common/campaign_setup.qc
 ../common/urllib.qc
 
+../common/command/markup.qc
+../common/command/rpn.qc
 ../common/command/generic.qc
 command/common.qc
-command/ipban.qc
+command/banning.qc
 command/radarmap.qc
 command/vote.qc
+command/getreplies.qc
 command/cmd.qc
 command/sv_cmd.qc
 
@@ -195,6 +202,7 @@ playerstats.qc
 ../common/explosion_equation.qc
 
 mutators/base.qc
+mutators/gamemode_ctf.qc
 mutators/gamemode_keyhunt.qc
 mutators/gamemode_freezetag.qc
 mutators/gamemode_keepaway.qc