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

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index a1e9f9e30ef2b9a3ffd716038c2a89880dd80338..d99b078914064985910b36b9334620b100fd5303 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/generic.qh
+../common/command/shared_defs.qh
 
 autocvars.qh
 constants.qh
@@ -35,6 +37,13 @@ campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
 
+command/common.qh
+command/ipban.qh
+command/radarmap.qh
+command/vote.qh
+command/cmd.qh
+command/sv_cmd.qh
+
 accuracy.qh
 csqcprojectile.qh
 ../common/csqcmodel_settings.qh
@@ -60,8 +69,6 @@ race.qh
 
 antilag.qh
 
-vote.qh
-
 playerdemo.qh
 
 // singleplayer stuff
@@ -134,17 +141,18 @@ 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/generic.qc
+command/common.qc
+command/ipban.qc
+command/radarmap.qc
+command/vote.qc
+command/cmd.qc
+command/sv_cmd.qc
 
 assault.qc
 
@@ -152,9 +160,6 @@ ipban.qc
 
 ../common/mapinfo.qc
 
-
-
-
 t_quake3.qc
 t_halflife.qc
 t_quake.qc