Merge remote-tracking branch 'origin/master' into samual/weapons

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 50b3b0b81b74a5541eb8a8fe7eb3ba8151ece603..4d3f965dfbfc7bb081df436dad9a96352219d091 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -11,14 +11,11 @@ sys-post.qh
 ../warpzonelib/common.qh
 ../warpzonelib/util_server.qh
 ../warpzonelib/server.qh
-
 ../common/constants.qh
 ../common/teams.qh
 ../common/util.qh
 ../common/test.qh
 ../common/counting.qh
-weapons/cl_weapons.qh
-../common/weapons/weapons.qh // WEAPONTODO
 ../common/urllib.qh
 ../common/command/markup.qh
 ../common/command/rpn.qh
@@ -27,6 +24,20 @@ weapons/cl_weapons.qh
 ../common/net_notice.qh
 ../common/animdecide.qh
 
+../common/weapons/config.qh
+../common/weapons/weapons.qh // TODO
+weapons/accuracy.qh
+weapons/common.qh
+weapons/csqcprojectile.qh // TODO
+weapons/hitplot.qh
+weapons/selection.qh
+weapons/spawning.qh
+weapons/throwing.qh
+weapons/tracing.qh
+weapons/weaponsystem.qh
+
+t_items.qh
+
 autocvars.qh
 constants.qh
 defs.qh                // Should rename this, it has fields and globals
@@ -63,8 +74,7 @@ command/getreplies.qh
 command/cmd.qh
 command/sv_cmd.qh
 
-weapons/accuracy.qh
-weapons/csqcprojectile.qh // TODO
+
 ../common/csqcmodel_settings.qh
 ../csqcmodellib/common.qh
 ../csqcmodellib/sv_model.qh
@@ -137,13 +147,19 @@ g_models.qc
 item_key.qc
 secret.qc
 
-weapons/main.qc
+weapons/accuracy.qc
 weapons/common.qc
 weapons/csqcprojectile.qc // TODO
+weapons/hitplot.qc
+weapons/selection.qc
+weapons/spawning.qc
+weapons/throwing.qc
+weapons/tracing.qc
+weapons/weaponsystem.qc
+../common/weapons/config.qc
 ../common/weapons/weapons.qc // TODO
 
 t_items.qc
-weapons/cl_weapons.qc // TODO
 cl_impulse.qc
 
 ent_cs.qc
@@ -153,8 +169,6 @@ cl_client.qc
 t_plats.qc
 antilag.qc
 
-weapons/accuracy.qc // TODO
-
 //ctf.qc
 //domination.qc
 //mode_onslaught.qc