Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 9d86a375f925455b3cf946e5a94420eef85b684a..75301d592972ee3e67ade8b01a84a72c7d188f19 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -8,7 +8,6 @@ sys-post.qh
 
 anticheat.qc
 antilag.qc
-// assault.qc
 campaign.qc
 cheats.qc
 cl_client.qc
@@ -16,13 +15,12 @@ cl_impulse.qc
 cl_physics.qc
 cl_player.qc
 csqceffects.qc
-// ctf.qc
-// domination.qc
 ent_cs.qc
 func_breakable.qc
 g_casings.qc
 g_damage.qc
 g_hook.qc
+// g_lights.qc // TODO: was never used
 g_models.qc
 g_subs.qc
 g_tetris.qc
@@ -33,14 +31,12 @@ ipban.qc
 item_key.qc
 mapvoting.qc
 miscfunctions.qc
-// mode_onslaught.qc
 movelib.qc
-// nexball.qc
+// pathlib.qc // TODO: was never used. Seems to duplicate `pathlib/`
 playerdemo.qc
 portals.qc
 race.qc
 round_handler.qc
-// runematch.qc
 scores.qc
 scores_rules.qc
 secret.qc
@@ -54,8 +50,8 @@ t_halflife.qc
 t_items.qc
 t_jumppads.qc
 t_plats.qc
-t_quake3.qc
 t_quake.qc
+t_quake3.qc
 t_swamp.qc
 t_teleporters.qc
 waypointsprites.qc
@@ -71,7 +67,7 @@ bot/havocbot/role_keyhunt.qc
 bot/havocbot/role_onslaught.qc
 bot/havocbot/roles.qc
 
-command/commands.qc
+command/all.qc
 
 mutators/mutators_include.qc
 mutators/mutators.qc
@@ -101,7 +97,7 @@ weapons/weaponsystem.qc
 ../common/campaign_file.qc
 ../common/campaign_setup.qc
 ../common/mapinfo.qc
-../common/monsters/monsters.qc
+../common/monsters/all.qc
 ../common/monsters/spawn.qc
 ../common/monsters/sv_monsters.qc
 ../common/nades.qc
@@ -111,8 +107,11 @@ weapons/weaponsystem.qc
 ../common/test.qc
 ../common/urllib.qc
 ../common/util.qc
+
+../common/items/all.qc
+
 ../common/weapons/config.qc
-../common/weapons/weapons.qc // TODO
+../common/weapons/all.qc // TODO
 
 ../csqcmodellib/sv_model.qc