Nades: rename registry globals

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

diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc
index b387ed35c382336522bc4d5ac06967d7f2b4c455..adb8cf6323d643006c4c832e44ef7886c782b374 100644 (file)
--- a/qcsrc/server/progs.inc
+++ b/qcsrc/server/progs.inc
@@ -30,7 +30,6 @@
 #include "mapvoting.qc"
 #include "miscfunctions.qc"
 #include "movelib.qc"
-// #include "pathlib.qc" // TODO: was never used. Seems to duplicate `pathlib/`
 #include "playerdemo.qc"
 #include "portals.qc"
 #include "race.qc"
@@ -80,17 +79,16 @@
 #include "weapons/weaponsystem.qc"
 
 #include "../common/animdecide.qc"
-#include "../common/buffs.qc"
 #include "../common/campaign_file.qc"
 #include "../common/campaign_setup.qc"
-#include "../common/effects.qc"
+#include "../common/effects/effects.qc"
+#include "../common/effects/effectinfo.qc"
 #include "../common/mapinfo.qc"
 #include "../common/monsters/spawn.qc"
 #include "../common/monsters/sv_monsters.qc"
 #include "../common/minigames/minigames.qc"
 #include "../common/minigames/sv_minigames.qc"
 #include "../common/movetypes/include.qc"
-#include "../common/nades.qc"
 #include "../common/net_notice.qc"
 #include "../common/notifications.qc"
 #include "../common/physics.qc"
@@ -99,16 +97,18 @@
 #include "../common/triggers/include.qc"
 #include "../common/util.qc"
 
+#include "../common/buffs/all.qc"
 #include "../common/items/all.qc"
 #include "../common/monsters/all.qc"
 #include "../common/mutators/all.qc"
+#include "../common/nades/all.qc"
+#include "../common/turrets/all.qc"
 #include "../common/vehicles/all.qc"
-#include "../common/weapons/all.qc" // TODO
+#include "../common/weapons/all.qc"
 
 #include "../common/turrets/sv_turrets.qc"
 #include "../common/turrets/config.qc"
 #include "../common/turrets/util.qc"
-#include "../common/turrets/turrets.qc"
 #include "../common/turrets/checkpoint.qc"
 #include "../common/turrets/targettrigger.qc"
 #include "../common/weapons/config.qc"
@@ -120,4 +120,6 @@
 #include "../warpzonelib/server.qc"
 #include "../warpzonelib/util_server.qc"
 
-#include "../mod/server/progs.inc"
+#if BUILD_MOD
+#include "../../mod/server/progs.inc"
+#endif