Cleanup #includes

diff --git a/qcsrc/client/_all.inc b/qcsrc/client/_all.inc
new file mode 100644 (file)
index 0000000..0c401ac
--- /dev/null
+++ b/qcsrc/client/_all.inc
@@ -0,0 +1,20 @@
+#include <client/_all.qh>
+#include "_mod.inc"
+
+#include "commands/_all.inc"
+#include "hud/_all.inc"
+#include "mutators/_all.inc"
+#include "weapons/_all.inc"
+
+#include <common/_all.inc>
+#include <common/effects/qc/all.qc>
+
+#include <lib/csqcmodel/cl_model.qc>
+#include <lib/csqcmodel/cl_player.qc>
+#include <lib/csqcmodel/interpolate.qc>
+
+#include <lib/warpzone/anglestransform.qc>
+#include <lib/warpzone/common.qc>
+#include <lib/warpzone/client.qc>
+#include <lib/warpzone/server.qc>
+#include <lib/warpzone/util_server.qc>

diff --git a/qcsrc/client/_all.qh b/qcsrc/client/_all.qh
index 746734dee2011e048533d0113c4d59a089ea4e82..5e5b55e313ae38a9355221fb79aabcb8401c429e 100644 (file)
--- a/qcsrc/client/_all.qh
+++ b/qcsrc/client/_all.qh
@@ -1,4 +1,5 @@
 #pragma once
+//#include "_mod.qh"
 
 #include <common/util.qh>
 

diff --git a/qcsrc/client/commands/_all.inc b/qcsrc/client/commands/_all.inc
new file mode 100644 (file)
index 0000000..c90682d
--- /dev/null
+++ b/qcsrc/client/commands/_all.inc
@@ -0,0 +1,4 @@
+#include <client/commands/_all.qh>
+#include "_mod.inc"
+
+#include <common/command/_all.inc>

diff --git a/qcsrc/client/commands/_all.qh b/qcsrc/client/commands/_all.qh
new file mode 100644 (file)
index 0000000..9b89bcd
--- /dev/null
+++ b/qcsrc/client/commands/_all.qh
@@ -0,0 +1,4 @@
+#pragma once
+#include "_mod.qh"
+
+#include <common/command/_all.qh>

diff --git a/qcsrc/client/commands/_mod.inc b/qcsrc/client/commands/_mod.inc
index 235f1297fda6e5c7fdc3d6b43c3cab94e0af6109..49fd90b32a5fb7adaef3a6811e27f0e80e74557a 100644 (file)
--- a/qcsrc/client/commands/_mod.inc
+++ b/qcsrc/client/commands/_mod.inc
@@ -1,3 +1,2 @@
 // generated file; do not modify
-#include <client/commands/all.qc>
 #include <client/commands/cl_cmd.qc>

diff --git a/qcsrc/client/commands/_mod.qh b/qcsrc/client/commands/_mod.qh
index 03df56398ccf89c0e09f1a70011698f8e1465d50..9e5aa99743259f10b08bae28abb27511f697129d 100644 (file)
--- a/qcsrc/client/commands/_mod.qh
+++ b/qcsrc/client/commands/_mod.qh
@@ -1,3 +1,2 @@
 // generated file; do not modify
-#include <client/commands/all.qh>
 #include <client/commands/cl_cmd.qh>

diff --git a/qcsrc/client/commands/all.qc b/qcsrc/client/commands/all.qc
deleted file mode 100644 (file)
index bc15eeb..0000000
--- a/qcsrc/client/commands/all.qc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "all.qh"
-#include <common/command/all.qc>

diff --git a/qcsrc/client/commands/all.qh b/qcsrc/client/commands/all.qh
deleted file mode 100644 (file)
index 2df61f0..0000000
--- a/qcsrc/client/commands/all.qh
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <common/command/all.qh>
-
-#include "cl_cmd.qh"

diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc
index 9b8f58f94418e13163a120c30eaefcb3f37bc886..4c8e915906e551b31b5880bd22a72a4f6b38b06e 100644 (file)
--- a/qcsrc/client/commands/cl_cmd.qc
+++ b/qcsrc/client/commands/cl_cmd.qc
@@ -4,12 +4,12 @@
 //  Last updated: December 28th, 2011
 // ==============================================
 
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 #include "cl_cmd.qh"
 
 #include "../autocvars.qh"
 #include "../defs.qh"
-#include <client/hud/all.qh>
+#include <client/hud/_all.qh>
 #include "../main.qh"
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"
@@ -18,8 +18,6 @@
 
 #include <common/mapinfo.qh>
 
-#include <common/command/generic.qh>
-
 void DrawDebugModel(entity this)
 {
        if (time - floor(time) > 0.5)

diff --git a/qcsrc/client/hud/_all.inc b/qcsrc/client/hud/_all.inc
new file mode 100644 (file)
index 0000000..9988f9a
--- /dev/null
+++ b/qcsrc/client/hud/_all.inc
@@ -0,0 +1,4 @@
+#include <client/hud/_all.qh>
+#include "_mod.inc"
+
+#include "panel/_all.inc"

diff --git a/qcsrc/client/hud/_all.qh b/qcsrc/client/hud/_all.qh
new file mode 100644 (file)
index 0000000..4ace83e
--- /dev/null
+++ b/qcsrc/client/hud/_all.qh
@@ -0,0 +1,4 @@
+#pragma once
+#include "_mod.qh"
+
+#include "panel/_all.qh"

diff --git a/qcsrc/client/hud/_mod.inc b/qcsrc/client/hud/_mod.inc
index b90f61b8cc443286de41af3507cfbf146f8c988c..f400d5d00d22957e094f3966a953525f1f05b71f 100644 (file)
--- a/qcsrc/client/hud/_mod.inc
+++ b/qcsrc/client/hud/_mod.inc
@@ -1,3 +1,4 @@
 // generated file; do not modify
 #include <client/hud/hud.qc>
 #include <client/hud/hud_config.qc>
+#include <client/hud/panel.qc>

diff --git a/qcsrc/client/hud/_mod.qh b/qcsrc/client/hud/_mod.qh
index ee9ac8f76f56736a9f05f6d0a60834abf3849b99..0ac7251308b3e26f4d167bc79ae6452a39bfa18c 100644 (file)
--- a/qcsrc/client/hud/_mod.qh
+++ b/qcsrc/client/hud/_mod.qh
@@ -1,3 +1,4 @@
 // generated file; do not modify
 #include <client/hud/hud.qh>
 #include <client/hud/hud_config.qh>
+#include <client/hud/panel.qh>

diff --git a/qcsrc/client/hud/all.inc b/qcsrc/client/hud/all.inc
deleted file mode 100644 (file)
index 8305304..0000000
--- a/qcsrc/client/hud/all.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "panel/weapons.qc"
-#include "panel/ammo.qc"
-#include "panel/powerups.qc"
-#include "panel/healtharmor.qc"
-#include "panel/notify.qc"
-#include "panel/timer.qc"
-#include "panel/radar.qc"
-#include "panel/score.qc"
-#include "panel/racetimer.qc"
-#include "panel/vote.qc"
-#include "panel/modicons.qc"
-#include "panel/pressedkeys.qc"
-#include "panel/chat.qc"
-#include "panel/engineinfo.qc"
-#include "panel/infomessages.qc"
-#include "panel/physics.qc"
-#include "panel/centerprint.qc"
-#include "panel/minigame.qc"
-// #include "panel/mapvote.qc"
-// #include "panel/itemstime.qc"
-#include "panel/quickmenu.qc"
-#include "panel/scoreboard.qc"

diff --git a/qcsrc/client/hud/all.qh b/qcsrc/client/hud/all.qh
deleted file mode 100644 (file)
index 2e458e6..0000000
--- a/qcsrc/client/hud/all.qh
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "hud.qh"
-#include "hud_config.qh"

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 3a33eb1dd1bbf82818ba5a3e4235888a0ed79137..760f5d438a8a305aae294ab0f3521dbd26fb1157 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -1,5 +1,7 @@
 #include "hud.qh"
 
+#include "panel/scoreboard.qh"
+
 #include "hud_config.qh"
 #include "../mapvoting.qh"
 #include "../teamradar.qh"
@@ -334,8 +336,6 @@ void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertica
        DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0);
 }
 
-#include "all.inc"
-
 /*
 ==================
 Main HUD system
@@ -357,6 +357,8 @@ void HUD_Vehicle()
        }
 }
 
+bool HUD_Minigame_Showpanels();
+
 bool HUD_Panel_CheckFlags(int showflags)
 {
     TC(int, showflags);
@@ -413,6 +415,7 @@ bool Hud_Shake_Update()
        return true;
 }
 
+entity CSQCModel_server2csqc(int i);
 void calc_followmodel_ofs(entity view);
 void Hud_Dynamic_Frame()
 {

diff --git a/qcsrc/client/hud/panel.qc b/qcsrc/client/hud/panel.qc
new file mode 100644 (file)
index 0000000..558f320
--- /dev/null
+++ b/qcsrc/client/hud/panel.qc
@@ -0,0 +1 @@
+#include "panel.qh"

diff --git a/qcsrc/client/hud/panel/_all.inc b/qcsrc/client/hud/panel/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/client/hud/panel/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/client/hud/panel/_all.qh b/qcsrc/client/hud/panel/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/client/hud/panel/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/client/hud/panel/_mod.inc b/qcsrc/client/hud/panel/_mod.inc
index d495fdee7670c8874ee45388484abd996092624c..7a95752132c43f3764da1a067db10667ba87c4bd 100644 (file)
--- a/qcsrc/client/hud/panel/_mod.inc
+++ b/qcsrc/client/hud/panel/_mod.inc
@@ -15,7 +15,7 @@
 #include <client/hud/panel/racetimer.qc>
 #include <client/hud/panel/radar.qc>
 #include <client/hud/panel/score.qc>
+#include <client/hud/panel/scoreboard.qc>
 #include <client/hud/panel/timer.qc>
 #include <client/hud/panel/vote.qc>
 #include <client/hud/panel/weapons.qc>
-#include <client/hud/panel/scoreboard.qc>

diff --git a/qcsrc/client/hud/panel/_mod.qh b/qcsrc/client/hud/panel/_mod.qh
index fa9b755309da1b4e2b90810e32179230189bd5b9..c24b5c0002876d29d4beca731325ca828004c4e3 100644 (file)
--- a/qcsrc/client/hud/panel/_mod.qh
+++ b/qcsrc/client/hud/panel/_mod.qh
@@ -15,7 +15,7 @@
 #include <client/hud/panel/racetimer.qh>
 #include <client/hud/panel/radar.qh>
 #include <client/hud/panel/score.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <client/hud/panel/timer.qh>
 #include <client/hud/panel/vote.qh>
 #include <client/hud/panel/weapons.qh>
-#include <client/hud/panel/scoreboard.qh>

diff --git a/qcsrc/client/hud/panel/ammo.qh b/qcsrc/client/hud/panel/ammo.qh
index 6db88c68b39ee50fce1f8acce9c778465a3223ae..71919d2fb094d48f6c0967de3b4a53cd39ffc453 100644 (file)
--- a/qcsrc/client/hud/panel/ammo.qh
+++ b/qcsrc/client/hud/panel/ammo.qh
@@ -1,2 +1,4 @@
 #pragma once
 #include "../panel.qh"
+
+void DrawNadeProgressBar(vector myPos, vector mySize, float progress, vector color);

diff --git a/qcsrc/client/hud/panel/centerprint.qh b/qcsrc/client/hud/panel/centerprint.qh
index 6db88c68b39ee50fce1f8acce9c778465a3223ae..1bec93efa644c684b35340f4973280742b259925 100644 (file)
--- a/qcsrc/client/hud/panel/centerprint.qh
+++ b/qcsrc/client/hud/panel/centerprint.qh
@@ -1,2 +1,4 @@
 #pragma once
 #include "../panel.qh"
+
+void reset_centerprint_messages();

diff --git a/qcsrc/client/hud/panel/powerups.qh b/qcsrc/client/hud/panel/powerups.qh
index 6db88c68b39ee50fce1f8acce9c778465a3223ae..3235f8da674507aa494cf3e7e8c29aa132db6bc0 100644 (file)
--- a/qcsrc/client/hud/panel/powerups.qh
+++ b/qcsrc/client/hud/panel/powerups.qh
@@ -1,2 +1,4 @@
 #pragma once
 #include "../panel.qh"
+
+void addPowerupItem(string name, string icon, vector color, float currentTime, float lifeTime);

diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc
index b2d3588844a00a6044e1cf338e3c1f4257a53c0e..1ceab88e9ad33a8d851e539de8192a99315c9573 100644 (file)
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -2,7 +2,7 @@
 // QuickMenu (#23)
 
 #include <common/ent_cs.qh>
-#include <client/hud/all.qh>
+#include <client/hud/_all.qh>
 #include <client/mapvoting.qh>
 
 // QUICKMENU_MAXLINES must be <= 10

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index c5e47237b17b995a16d29cf06a5d5c9964c769df..b23a77053031c7938c83f11a7e48d32eecc6747d 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1,7 +1,7 @@
 #include "main.qh"
 
 #include <common/effects/qc/all.qh>
-#include "hud/all.qh"
+#include "hud/_all.qh"
 #include "mapvoting.qh"
 #include "mutators/events.qh"
 #include "hud/panel/scoreboard.qh"

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 19c128a7da6db459c14e59c4b3737dd6cb965a36..c397c882c9c8aa96a51707c27634740ea021656e 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,6 +1,6 @@
 #include "mapvoting.qh"
 
-#include "hud/all.qh"
+#include "hud/_all.qh"
 #include "hud/panel/scoreboard.qh"
 
 #include <common/mapinfo.qh>

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 01b0ee3cb440c09d4b00503500f9a2561d697fd7..9b9833286cedf7dee5e001430804c5a61f2472cc 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -1,8 +1,8 @@
 #include "miscfunctions.qh"
 
-#include "hud/all.qh"
+#include "hud/_all.qh"
 
-#include <common/command/generic.qh>
+#include <common/command/_all.qh>
 
 #include <common/teams.qh>
 

diff --git a/qcsrc/client/mutators/_all.inc b/qcsrc/client/mutators/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/client/mutators/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/client/mutators/_all.qh b/qcsrc/client/mutators/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/client/mutators/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/client/mutators/_mod.inc b/qcsrc/client/mutators/_mod.inc
index 98fb4815c1ce28cc699a429537ea75c2643b4487..3dfd4f78974b38371a435762abe7eaa35f611c85 100644 (file)
--- a/qcsrc/client/mutators/_mod.inc
+++ b/qcsrc/client/mutators/_mod.inc
@@ -1 +1,2 @@
 // generated file; do not modify
+#include <client/mutators/events.qc>

diff --git a/qcsrc/client/mutators/_mod.qh b/qcsrc/client/mutators/_mod.qh
index 98fb4815c1ce28cc699a429537ea75c2643b4487..b54ee489cf0909a46d34a92a313124cd27d80619 100644 (file)
--- a/qcsrc/client/mutators/_mod.qh
+++ b/qcsrc/client/mutators/_mod.qh
@@ -1 +1,2 @@
 // generated file; do not modify
+#include <client/mutators/events.qh>

diff --git a/qcsrc/client/mutators/events.qc b/qcsrc/client/mutators/events.qc
new file mode 100644 (file)
index 0000000..c2dbb70
--- /dev/null
+++ b/qcsrc/client/mutators/events.qc
@@ -0,0 +1 @@
+#include "events.qh"

diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc
index 48579ecbb3018b131203cbe08ea5231a427f560f..cd08bf188bc86a9626f0939b12f99274cc4c137a 100644 (file)
--- a/qcsrc/client/progs.inc
+++ b/qcsrc/client/progs.inc
@@ -1,28 +1,7 @@
 #include <lib/_all.inc>
 
 #if XONOTIC
-
-#include "_all.qh"
-
-#include "../client/_mod.inc"
-#include "commands/_mod.inc"
-#include "hud/_mod.inc"
-#include "mutators/_mod.inc"
-#include "weapons/_mod.inc"
-
-#include <common/_all.inc>
-#include <common/effects/qc/all.qc>
-
-#include <lib/csqcmodel/cl_model.qc>
-#include <lib/csqcmodel/cl_player.qc>
-#include <lib/csqcmodel/interpolate.qc>
-
-#include <lib/warpzone/anglestransform.qc>
-#include <lib/warpzone/common.qc>
-#include <lib/warpzone/client.qc>
-#include <lib/warpzone/server.qc>
-#include <lib/warpzone/util_server.qc>
-
+#include "_all.inc"
 #endif
 
 #include <ecs/_lib.inc>

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 165b033fb3558c8197e6e758b4dd4b39f3156f4e..9797abfb1eae1586dc0ad37e2b5b4f1256b3a2f6 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -1,6 +1,6 @@
 #include "shownames.qh"
 
-#include "hud/all.qh"
+#include "hud/_all.qh"
 
 #include <common/ent_cs.qh>
 #include <common/constants.qh>

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index ab14cd3bf38d04a89d48ead845339bcbf582e271..84fba6ca68bb2c08306ac62309b004bff41f5e65 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -1,6 +1,6 @@
 #include "teamradar.qh"
 
-#include "hud/all.qh"
+#include "hud/_all.qh"
 
 #include <common/mutators/mutator/waypoints/all.qh>
 

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 339d05209d2e891dbc195458fecfd2ed7574838e..8070d0c440c44ca5cec09cf0b88e26d51d6bef43 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1,7 +1,7 @@
 #include "view.qh"
 
 #include "announcer.qh"
-#include "hud/all.qh"
+#include "hud/_all.qh"
 #include "mapvoting.qh"
 #include "shownames.qh"
 #include "hud/panel/scoreboard.qh"

diff --git a/qcsrc/client/weapons/_all.inc b/qcsrc/client/weapons/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/client/weapons/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/client/weapons/_all.qh b/qcsrc/client/weapons/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/client/weapons/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc
index b16c24fb47086179068f433c7b93a057f28836c0..ef1e03e19f8b8a3fc02bce1a2f9c6380073ad11d 100644 (file)
--- a/qcsrc/common/_all.inc
+++ b/qcsrc/common/_all.inc
@@ -39,11 +39,11 @@ float autocvar_net_connecttimeout = 30;
 #include "t_items.qc"
 #endif
 
-#include "items/_mod.inc"
+#include "items/_all.inc"
     #include "weapons/all.qc"
         #include "monsters/all.qc"
         #include "turrets/all.qc"
         #include "vehicles/all.qc"
 
-#include "mutators/_mod.inc"
-    #include "gamemodes/_mod.inc"
+#include "mutators/_all.inc"
+    #include "gamemodes/_all.inc"

diff --git a/qcsrc/common/command/_all.inc b/qcsrc/common/command/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/common/command/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/common/command/_all.qh b/qcsrc/common/command/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/common/command/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/command/_mod.inc b/qcsrc/common/command/_mod.inc
index d2d24f03d901cb0775702698267551e80eabb7d9..e3099980edfca432898b372a6086463f04680b88 100644 (file)
--- a/qcsrc/common/command/_mod.inc
+++ b/qcsrc/common/command/_mod.inc
@@ -1,5 +1,5 @@
 // generated file; do not modify
-#include <common/command/all.qc>
 #include <common/command/generic.qc>
 #include <common/command/markup.qc>
+#include <common/command/reg.qc>
 #include <common/command/rpn.qc>

diff --git a/qcsrc/common/command/_mod.qh b/qcsrc/common/command/_mod.qh
index 440bdcb13460d5486a642803de0604d0a82ba58d..6ca293773c6c51b42551693bd54b1ad397db4d52 100644 (file)
--- a/qcsrc/common/command/_mod.qh
+++ b/qcsrc/common/command/_mod.qh
@@ -1,5 +1,5 @@
 // generated file; do not modify
-#include <common/command/all.qh>
 #include <common/command/generic.qh>
 #include <common/command/markup.qh>
+#include <common/command/reg.qh>
 #include <common/command/rpn.qh>

diff --git a/qcsrc/common/command/all.qc b/qcsrc/common/command/all.qc
deleted file mode 100644 (file)
index dc1c044..0000000
--- a/qcsrc/common/command/all.qc
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "generic.qc"
-#include "markup.qc"
-#include "rpn.qc"

diff --git a/qcsrc/common/command/all.qh b/qcsrc/common/command/all.qh
deleted file mode 100644 (file)
index 15285b9..0000000
--- a/qcsrc/common/command/all.qh
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "command.qh"
-REGISTRY(GENERIC_COMMANDS, BITS(7))
-#define GENERIC_COMMANDS_from(i) _GENERIC_COMMANDS_from(i, NULL)
-REGISTER_REGISTRY(GENERIC_COMMANDS)
-REGISTRY_SORT(GENERIC_COMMANDS)
-
-#define GENERIC_COMMAND(id, description) \
-       CLASS(genericcommand_##id, Command) \
-               ATTRIB(genericcommand_##id, m_name, string, #id); \
-       ATTRIB(genericcommand_##id, m_description, string, description); \
-       ENDCLASS(genericcommand_##id) \
-    REGISTER(GENERIC_COMMANDS, CMD_G, id, m_id, NEW(genericcommand_##id)); \
-       METHOD(genericcommand_##id, m_invokecmd, void(genericcommand_##id this, int request, entity caller, int arguments, string command))
-
-STATIC_INIT(GENERIC_COMMANDS_aliases) {
-       FOREACH(GENERIC_COMMANDS, true, localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_svmenu")));
-}
-
-#include "generic.qh"
-#include "markup.qh"
-#include "rpn.qh"

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 8f3449b3e16cfaef91bcc8b0b0bd47171deb8523..5693329182ef4b95861797abd74fb3c85fd1d259 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -1,4 +1,5 @@
-#include "all.qh"
+#include "_all.qh"
+#include "reg.qh"
 
 #include "markup.qh"
 #include "rpn.qh"
@@ -14,10 +15,7 @@
 #endif
 
 #ifdef SVQC
-       #include <server/command/banning.qh>
-       #include <server/command/cmd.qh>
-       #include <server/command/common.qh>
-       #include <server/command/sv_cmd.qh>
+       #include <server/command/_all.qh>
        #include <common/turrets/config.qh>
        #include <common/weapons/config.qh>
 #endif

diff --git a/qcsrc/common/command/reg.qc b/qcsrc/common/command/reg.qc
new file mode 100644 (file)
index 0000000..c0af5b5
--- /dev/null
+++ b/qcsrc/common/command/reg.qc
@@ -0,0 +1 @@
+#include "reg.qh"

diff --git a/qcsrc/common/command/reg.qh b/qcsrc/common/command/reg.qh
new file mode 100644 (file)
index 0000000..9868e24
--- /dev/null
+++ b/qcsrc/common/command/reg.qh
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "command.qh"
+REGISTRY(GENERIC_COMMANDS, BITS(7))
+#define GENERIC_COMMANDS_from(i) _GENERIC_COMMANDS_from(i, NULL)
+REGISTER_REGISTRY(GENERIC_COMMANDS)
+REGISTRY_SORT(GENERIC_COMMANDS)
+
+#define GENERIC_COMMAND(id, description) \
+       CLASS(genericcommand_##id, Command) \
+               ATTRIB(genericcommand_##id, m_name, string, #id); \
+       ATTRIB(genericcommand_##id, m_description, string, description); \
+       ENDCLASS(genericcommand_##id) \
+    REGISTER(GENERIC_COMMANDS, CMD_G, id, m_id, NEW(genericcommand_##id)); \
+       METHOD(genericcommand_##id, m_invokecmd, void(genericcommand_##id this, int request, entity caller, int arguments, string command))
+
+STATIC_INIT(GENERIC_COMMANDS_aliases) {
+       FOREACH(GENERIC_COMMANDS, true, localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_svmenu")));
+}

diff --git a/qcsrc/common/gamemodes/_all.inc b/qcsrc/common/gamemodes/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/common/gamemodes/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/common/gamemodes/_all.qh b/qcsrc/common/gamemodes/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/common/gamemodes/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/items/_all.inc b/qcsrc/common/items/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/common/items/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/common/items/_all.qh b/qcsrc/common/items/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/common/items/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/items/all.qc b/qcsrc/common/items/all.qc
index 7a3e5004696ee1c655a8f5eca7e3cb5cb3506b54..ab77f3071e975671cd3cec3e915037bfc5b25c0a 100644 (file)
--- a/qcsrc/common/items/all.qc
+++ b/qcsrc/common/items/all.qc
@@ -2,7 +2,7 @@
 #define ITEMS_ALL_C
 #include "all.qh"
 
-#include "item/_mod.inc"
+#include "item/_all.inc"
 
 void Dump_Items()
 {

diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh
index ff54a3a299f8a3e614fc0e7c62992591b0c8777d..73bd502c8fa13a8a1c1a05b3545a099e16dba1a8 100644 (file)
--- a/qcsrc/common/items/all.qh
+++ b/qcsrc/common/items/all.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/all.qh>
+#include <common/command/_all.qh>
 
 #include "item.qh"
 

diff --git a/qcsrc/common/items/item/_all.inc b/qcsrc/common/items/item/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/common/items/item/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/common/items/item/_all.qh b/qcsrc/common/items/item/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/common/items/item/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/monsters/all.qc b/qcsrc/common/monsters/all.qc
index fa3f65193ae5725bc0e4a87806433875344a23f3..3abacacca12430efacb80d32a2fa128ebcad4064 100644 (file)
--- a/qcsrc/common/monsters/all.qc
+++ b/qcsrc/common/monsters/all.qc
@@ -15,7 +15,7 @@ string M_Model(string m_mdl)
 #include "all.qh"
 
 #define IMPLEMENTATION
-#include "monster/_mod.inc"
+#include "monster/_all.inc"
 #undef IMPLEMENTATION
 
 #ifdef SVQC

diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh
index 84f7a0d78f6d19d4121334681655c170e19f2569..d49489f134b8f2d0f70c9f629dae4f8ba78eb5b6 100644 (file)
--- a/qcsrc/common/monsters/all.qh
+++ b/qcsrc/common/monsters/all.qh
@@ -16,4 +16,4 @@ const int MON_FIRST = 1;
 REGISTER_MONSTER(Null, NEW(Monster));
 
 
-#include "monster/_mod.inc"
+#include "monster/_all.inc"

diff --git a/qcsrc/common/monsters/monster/_all.inc b/qcsrc/common/monsters/monster/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/common/monsters/monster/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/common/monsters/monster/_all.qh b/qcsrc/common/monsters/monster/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/common/monsters/monster/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index ea46be5f12e7343152b8920cc2f7089d9f6253bf..21d5ad73f9a519773a6aadad8375530e72b3be90 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -18,8 +18,7 @@
        #include "../turrets/util.qh"
     #include "../vehicles/all.qh"
     #include <server/campaign.qh>
-    #include <server/command/common.qh>
-    #include <server/command/cmd.qh>
+    #include <server/command/_all.qh>
        #include "../triggers/triggers.qh"
     #include <lib/csqcmodel/sv_model.qh>
     #include <server/round_handler.qh>

diff --git a/qcsrc/common/mutators/_all.inc b/qcsrc/common/mutators/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/common/mutators/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/common/mutators/_all.qh b/qcsrc/common/mutators/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/common/mutators/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh
index 983b69f3f4562b3a6a96363ef94543940de4f983..e66ea3f0a5ea15c007b164fcde1b76c24960bf30 100644 (file)
--- a/qcsrc/common/notifications/all.qh
+++ b/qcsrc/common/notifications/all.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/all.qh>
+#include <common/command/_all.qh>
 
 #include <common/constants.qh>
 #include <common/teams.qh>

diff --git a/qcsrc/common/turrets/all.qc b/qcsrc/common/turrets/all.qc
index 469a64c9274b240758ebd40eeeb8d4f19576d767..ec62c248c14cde57c4874a3c9247e7ed20ccf804 100644 (file)
--- a/qcsrc/common/turrets/all.qc
+++ b/qcsrc/common/turrets/all.qc
@@ -7,7 +7,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_TURRET)
 #endif
 
 #define IMPLEMENTATION
-#include "turret/_mod.inc"
+#include "turret/_all.inc"
 #undef IMPLEMENTATION
 
 #ifdef CSQC

diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh
index 476da2d18e0423d7c242963fc14408ff3e7d7ad1..cbb0379f04b5a9cf8023d4aaf6710a8c01b65006 100644 (file)
--- a/qcsrc/common/turrets/all.qh
+++ b/qcsrc/common/turrets/all.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/all.qh>
+#include <common/command/_all.qh>
 #include "config.qh"
 
 #include "turret.qh"
@@ -73,4 +73,4 @@ const int TUR_FIRST = 1;
 
 REGISTER_TURRET(Null, NEW(Turret));
 
-#include "turret/_mod.inc"
+#include "turret/_all.inc"

diff --git a/qcsrc/common/turrets/turret/_all.inc b/qcsrc/common/turrets/turret/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/common/turrets/turret/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/common/turrets/turret/_all.qh b/qcsrc/common/turrets/turret/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/common/turrets/turret/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/turrets/turret/ewheel.qh b/qcsrc/common/turrets/turret/ewheel.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/ewheel.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/flac.qh b/qcsrc/common/turrets/turret/flac.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/flac.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/fusionreactor.qh b/qcsrc/common/turrets/turret/fusionreactor.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/fusionreactor.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/hellion.qh b/qcsrc/common/turrets/turret/hellion.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/hellion.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/hk.qh b/qcsrc/common/turrets/turret/hk.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/hk.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/machinegun.qh b/qcsrc/common/turrets/turret/machinegun.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/machinegun.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/mlrs.qh b/qcsrc/common/turrets/turret/mlrs.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/mlrs.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/phaser.qh b/qcsrc/common/turrets/turret/phaser.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/phaser.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/plasma.qh b/qcsrc/common/turrets/turret/plasma.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/plasma.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/plasma_dual.qh b/qcsrc/common/turrets/turret/plasma_dual.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/plasma_dual.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/tesla.qh b/qcsrc/common/turrets/turret/tesla.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/tesla.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/turrets/turret/walker.qh b/qcsrc/common/turrets/turret/walker.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/turrets/turret/walker.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/vehicles/all.qc b/qcsrc/common/vehicles/all.qc
index 251df22839e750646abef244455aa63d7e846df5..5a14b647d12abe94bc500408dcc66fd02636dd28 100644 (file)
--- a/qcsrc/common/vehicles/all.qc
+++ b/qcsrc/common/vehicles/all.qc
@@ -12,7 +12,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR)
 #endif
 
 #define IMPLEMENTATION
-#include "vehicle/_mod.inc"
+#include "vehicle/_all.inc"
 #undef IMPLEMENTATION
 
 #endif

diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh
index 158492f661e7e1326cc248283c3b4841bb64c76a..779076a7436293785a7d807b3d426355f6a341a2 100644 (file)
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -20,4 +20,4 @@ const int VEH_FIRST = 1;
 
 REGISTER_VEHICLE(Null, NEW(Vehicle));
 
-#include "vehicle/_mod.inc"
+#include "vehicle/_all.inc"

diff --git a/qcsrc/common/vehicles/vehicle/_all.inc b/qcsrc/common/vehicles/vehicle/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/common/vehicles/vehicle/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/common/vehicles/vehicle/_all.qh b/qcsrc/common/vehicles/vehicle/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/common/vehicles/vehicle/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/common/vehicles/vehicle/racer.qh b/qcsrc/common/vehicles/vehicle/racer.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/vehicles/vehicle/racer.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qh b/qcsrc/common/vehicles/vehicle/spiderbot.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/vehicles/vehicle/spiderbot.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 2b75ec0313f9aa015b916b0d7479c44b12a11be8..d1bd2d7e649da0c9bdb8c32a1a80e8890ecae573 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -39,7 +39,7 @@
     #include "../deathtypes/all.qh"
     #include <server/mutators/all.qh>
     #include "../mapinfo.qh"
-    #include <server/command/common.qh>
+    #include <server/command/_all.qh>
     #include <lib/csqcmodel/sv_model.qh>
     #include <server/portals.qh>
     #include <server/g_hook.qh>

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index a3f7eb4d0fa0bb26312e8bc708b2cdf3b9ea90ca..113ae8306d693984b5fbdb8409dafb1f766ecea8 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/all.qh>
+#include <common/command/_all.qh>
 #include <common/stats.qh>
 #include "config.qh"
 

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index 83a0ebf34a01bb06755ba9021eeb0e2508340285..cdacdc64c07bdc4fd6052832ed2e1e305783e77b 100644 (file)
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -122,7 +122,7 @@ void    isnt_bool(float this) { print(ftos(this)); }
 #include "vector.qh"
 #include "yenc.qh"
 
-#include "matrix/_mod.inc"
+#include "matrix/_all.inc"
 
 #ifndef SVQC
 #define objerror_safe(e)

diff --git a/qcsrc/lib/matrix/_all.inc b/qcsrc/lib/matrix/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/lib/matrix/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/lib/matrix/_all.qh b/qcsrc/lib/matrix/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/lib/matrix/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/lib/matrix/command.qc b/qcsrc/lib/matrix/command.qc
index 27c7ec959c50e79fcafceccaf24732fee6119253..449aa373b31885d5aa3a5958d7855c94c4fd3d6c 100644 (file)
--- a/qcsrc/lib/matrix/command.qc
+++ b/qcsrc/lib/matrix/command.qc
@@ -1,6 +1,6 @@
 #include "command.qh"
 
-#include <common/command/all.qh>
+#include <common/command/_mod.qh>
 
 GENERIC_COMMAND(mx, "Send a matrix command") {
     switch (argv(1)) {

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index de692ee8198f06577d1e2f38406e3ed9b0c6e466..bff21970225e417191aa20600783f8070bb45561 100644 (file)
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -7,7 +7,7 @@
        #include <common/constants.qh>
        #include <common/triggers/subs.qh>
        #include <common/util.qh>
-       #include <server/command/common.qh>
+       #include <server/command/_all.qh>
        #include <server/constants.qh>
        #include <server/defs.qh>
 #endif

diff --git a/qcsrc/menu/_all.inc b/qcsrc/menu/_all.inc
new file mode 100644 (file)
index 0000000..bebbdcc
--- /dev/null
+++ b/qcsrc/menu/_all.inc
@@ -0,0 +1,10 @@
+#include <menu/_all.qh>
+#include "_mod.inc"
+
+#include "anim/_all.inc"
+#include "command/_all.inc"
+#include "item/_all.inc"
+#include "mutators/_all.inc"
+#include "xonotic/_all.inc"
+
+#include <common/_all.inc>

diff --git a/qcsrc/menu/anim/_all.inc b/qcsrc/menu/anim/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/menu/anim/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/menu/anim/_all.qh b/qcsrc/menu/anim/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/menu/anim/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/menu/auto-super.pl b/qcsrc/menu/auto-super.pl
deleted file mode 100644 (file)
index 00926d0..0000000
--- a/qcsrc/menu/auto-super.pl
+++ /dev/null
@@ -1,101 +0,0 @@
-my %classoffile = ();
-my %classes = ();
-my %baseclass = ();
-my %methods = ();
-my %attrs = ();
-my %methodnames = ();
-my %old2new = ();
-
-print STDERR "Scanning...\n";
-for my $f(@ARGV)
-{
-       open my $fh, '<', $f;
-       while(<$fh>)
-       {
-               if(/^CLASS\(([^)]*)\)(?:\s*EXTENDS\(([^)]*)\))?/)
-               {
-                       $classes{$1} = defined($2) ? $2 : "Object";
-                       $classoffile{$f} = $1;
-               }
-               if(/^\s*METHOD\(([^),]*),\s*([^),]*)/)
-               {
-                       $methods{$1}{$2} = $1;
-                       $methodnames{"$1"."_"."$2"} = $f;
-                       $old2new{"$2$1"} = "$1"."_"."$2";
-               }
-               if(/^\s*ATTRIB(?:ARRAY)?\(([^),]*),\s*([^),]*)/)
-               {
-                       $attrs{$1}{$2} = $1;
-               }
-       }
-       close $fh;
-}
-
-# propagate down methods etc.
-print STDERR "Propagating...\n";
-for my $class(keys %classes)
-{
-       print STDERR "$class";
-       my $base = $class;
-       for(;;)
-       {
-               $base = $classes{$base};
-               last if not defined $base;
-               print STDERR " -> $base";
-               while(my ($method, $definingclass) = each %{$methods{$base}})
-               {
-                       $methods{$class}{$method} = $definingclass
-                               if not defined $methods{$class}{$method};
-               }
-               while(my ($attr, $definingclass) = each %{$attrs{$base}})
-               {
-                       $attrs{$class}{$attr} = $definingclass
-                               if not defined $attrs{$class}{$attr};
-               }
-       }
-       print STDERR "\n";
-}
-
-# change all calls to base method to super, complain about skipping
-print STDERR "Fixing...\n";
-for my $f(@ARGV)
-{
-       open my $fh, '<', $f;
-       my $s = do { undef local $/; <$fh>; };
-       my $s0 = $s;
-       close $fh;
-
-       my $class = $classoffile{$f};
-       my $base = $classes{$class};
-       next if not defined $base;
-
-       for(keys %old2new)
-       {
-               $s =~ s/\b$_\b/$old2new{$_}/g;
-       }
-
-       my @methods_super = map { [ $methods{$base}{$_} . "_" . $_, "SUPER($class).$_" ]; } keys %{$methods{$base}};
-       for(@methods_super)
-       {
-               my ($search, $replace) = @$_;
-               my $n = ($s =~ s/\b$search\b/$replace/g);
-               print STDERR "[$f] $search -> $replace... $n replacements\n"
-                       if $n;
-       }
-
-       for(grep { $methodnames{$_} ne $f } keys %methodnames)
-       {
-               if($s =~ /\b$_\b/)
-               {
-                       print STDERR "[$f] calls non-super external method directly: $_\n";
-               }
-       }
-
-       if($s ne $s0)
-       {
-               print STDERR "Rewriting $f...\n";
-               open my $fh, '>', $f;
-               print $fh $s;
-               close $fh;
-       }
-}

diff --git a/qcsrc/menu/command/_all.inc b/qcsrc/menu/command/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/menu/command/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/menu/command/_all.qh b/qcsrc/menu/command/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/menu/command/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/menu/command/all.qc b/qcsrc/menu/command/all.qc
index 2f8df96b6bfb57d773d6e237a6ad9f542c63f3a4..63b9b78a850ccbc7d2d1259aff9260ccfc32f549 100644 (file)
--- a/qcsrc/menu/command/all.qc
+++ b/qcsrc/menu/command/all.qc
@@ -1,3 +1,3 @@
 #include "all.qh"
 
-#include <common/command/all.qc>
+#include <common/command/_all.inc>

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index 0f87cbb0959cb38df039f1cac70f796cabd0185b..fb0ac17993edc742722fd08ae7c2a2c4b3c8b1b2 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -5,7 +5,7 @@
 
 #include "../mutators/events.qh"
 
-#include <common/command/generic.qh>
+#include <common/command/_all.qh>
 
 .entity firstChild, nextSibling;
 

diff --git a/qcsrc/menu/item/_all.inc b/qcsrc/menu/item/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/menu/item/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/menu/item/_all.qh b/qcsrc/menu/item/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/menu/item/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/menu/mutators/_all.inc b/qcsrc/menu/mutators/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/menu/mutators/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/menu/mutators/_all.qh b/qcsrc/menu/mutators/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/menu/mutators/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/menu/progs.inc b/qcsrc/menu/progs.inc
index ad08af93dd5581bb5076865763737d9c20ca2ec4..80d14752922dc2945e751e4ca0df4c29e8901946 100644 (file)
--- a/qcsrc/menu/progs.inc
+++ b/qcsrc/menu/progs.inc
@@ -1,16 +1,7 @@
 #include <lib/_all.inc>
 
 #if XONOTIC
-
-#include "../menu/_mod.inc"
-#include "anim/_mod.inc"
-#include "command/_mod.inc"
-#include "item/_mod.inc"
-#include "mutators/_mod.inc"
-#include "xonotic/_mod.inc"
-
-#include <common/_all.inc>
-
+#include "_all.inc"
 #endif
 
 #if BUILD_MOD

diff --git a/qcsrc/menu/xonotic/_all.inc b/qcsrc/menu/xonotic/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/menu/xonotic/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/menu/xonotic/_all.qh b/qcsrc/menu/xonotic/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/menu/xonotic/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 9cc4da8c38705baeeb633b9607ad7086870848bf..3ad57544888ddbb652bc5c15da210e152e63c599 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -7,7 +7,7 @@
 #include <common/constants.qh>
 #include <common/mapinfo.qh>
 #include <common/util.qh>
-#include <common/command/generic.qh>
+#include <common/command/_all.qh>
 
 float GL_CheckExtension(string ext)
 {

diff --git a/qcsrc/server/_all.inc b/qcsrc/server/_all.inc
new file mode 100644 (file)
index 0000000..d2d15bb
--- /dev/null
+++ b/qcsrc/server/_all.inc
@@ -0,0 +1,18 @@
+#include <server/_all.qh>
+#include "_mod.inc"
+
+#include "bot/_all.inc"
+#include "command/_all.inc"
+#include "mutators/_all.inc"
+#include "pathlib/_all.inc"
+#include "weapons/_all.inc"
+
+#include <common/_all.inc>
+#include <common/effects/qc/all.qc>
+
+#include <lib/csqcmodel/sv_model.qc>
+
+#include <lib/warpzone/anglestransform.qc>
+#include <lib/warpzone/common.qc>
+#include <lib/warpzone/server.qc>
+#include <lib/warpzone/util_server.qc>

diff --git a/qcsrc/server/bot/_all.inc b/qcsrc/server/bot/_all.inc
new file mode 100644 (file)
index 0000000..ae3f973
--- /dev/null
+++ b/qcsrc/server/bot/_all.inc
@@ -0,0 +1,4 @@
+#include <server/bot/_all.qh>
+#include "_mod.inc"
+
+#include "default/_all.inc"

diff --git a/qcsrc/server/bot/_all.qh b/qcsrc/server/bot/_all.qh
new file mode 100644 (file)
index 0000000..1d31636
--- /dev/null
+++ b/qcsrc/server/bot/_all.qh
@@ -0,0 +1,4 @@
+#pragma once
+#include "_mod.qh"
+
+#include "default/_all.qh"

diff --git a/qcsrc/server/bot/api.qc b/qcsrc/server/bot/api.qc
index 85b0e46568ddad223ba9cce0d67808d616df82ac..274b0340335beed726f58bce67fc0d0db5fd0fc8 100644 (file)
--- a/qcsrc/server/bot/api.qc
+++ b/qcsrc/server/bot/api.qc
@@ -1,49 +1 @@
 #include "api.qh"
-
-#if 1
-
-#include "default/_mod.inc"
-#include "default/havocbot/_mod.inc"
-
-#else
-
-bool bot_aim(entity this, float shotspeed, float shotspeedupward, float maxshottime, float applygravity) { return false; }
-void bot_clientconnect(entity this) { }
-void bot_clientdisconnect(entity this) { }
-void bot_cmdhelp(string scmd) { }
-void bot_endgame() { }
-bool bot_fixcount() { return true; }
-void bot_list_commands() { }
-void bot_queuecommand(entity bot, string cmdstring) { }
-void bot_relinkplayerlist() { }
-void bot_resetqueues() { }
-void bot_serverframe() { }
-bool bot_shouldattack(entity this, entity e) { return false; }
-void bot_think(entity this) { }
-
-entity find_bot_by_name(string name) { return NULL; }
-entity find_bot_by_number(float number) { return NULL; }
-
-void havocbot_goalrating_controlpoints(entity this, float ratingscale, vector org, float sradius) { }
-void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org, float sradius) { }
-void havocbot_goalrating_items(entity this, float ratingscale, vector org, float sradius) { }
-
-entity navigation_findnearestwaypoint(entity ent, float walkfromwp) { return NULL; }
-void navigation_goalrating_end(entity this) { }
-void navigation_goalrating_start(entity this) { }
-void navigation_markroutes(entity this, entity fixed_source_waypoint) { }
-void navigation_markroutes_inverted(entity fixed_source_waypoint) { }
-void navigation_routerating(entity this, entity e, float f, float rangebias) { }
-
-bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float movemode) { return false; }
-
-void waypoint_remove(entity e) { }
-void waypoint_saveall() { }
-void waypoint_schedulerelinkall() { }
-void waypoint_schedulerelink(entity wp) { }
-void waypoint_spawnforitem(entity e) { }
-void waypoint_spawnforitem_force(entity e, vector org) { }
-void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) { }
-void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken) { }
-entity waypoint_spawn(vector m1, vector m2, float f) { return NULL; }
-#endif

diff --git a/qcsrc/server/bot/default/_all.inc b/qcsrc/server/bot/default/_all.inc
new file mode 100644 (file)
index 0000000..f856187
--- /dev/null
+++ b/qcsrc/server/bot/default/_all.inc
@@ -0,0 +1,4 @@
+#include <server/bot/default/_all.qh>
+#include "_mod.inc"
+
+#include "havocbot/_all.inc"

diff --git a/qcsrc/server/bot/default/_all.qh b/qcsrc/server/bot/default/_all.qh
new file mode 100644 (file)
index 0000000..43706ce
--- /dev/null
+++ b/qcsrc/server/bot/default/_all.qh
@@ -0,0 +1,4 @@
+#pragma once
+#include "_mod.qh"
+
+#include "havocbot/_all.qh"

diff --git a/qcsrc/server/bot/default/havocbot/_all.inc b/qcsrc/server/bot/default/havocbot/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/server/bot/default/havocbot/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/server/bot/default/havocbot/_all.qh b/qcsrc/server/bot/default/havocbot/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/server/bot/default/havocbot/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/server/bot/null/bot_null.qc b/qcsrc/server/bot/null/bot_null.qc
new file mode 100644 (file)
index 0000000..75a7bcd
--- /dev/null
+++ b/qcsrc/server/bot/null/bot_null.qc
@@ -0,0 +1,41 @@
+#include "bot_null.qh"
+
+bool bot_aim(entity this, float shotspeed, float shotspeedupward, float maxshottime, float applygravity) { return false; }
+void bot_clientconnect(entity this) { }
+void bot_clientdisconnect(entity this) { }
+void bot_cmdhelp(string scmd) { }
+void bot_endgame() { }
+bool bot_fixcount() { return true; }
+void bot_list_commands() { }
+void bot_queuecommand(entity bot, string cmdstring) { }
+void bot_relinkplayerlist() { }
+void bot_resetqueues() { }
+void bot_serverframe() { }
+bool bot_shouldattack(entity this, entity e) { return false; }
+void bot_think(entity this) { }
+
+entity find_bot_by_name(string name) { return NULL; }
+entity find_bot_by_number(float number) { return NULL; }
+
+void havocbot_goalrating_controlpoints(entity this, float ratingscale, vector org, float sradius) { }
+void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org, float sradius) { }
+void havocbot_goalrating_items(entity this, float ratingscale, vector org, float sradius) { }
+
+entity navigation_findnearestwaypoint(entity ent, float walkfromwp) { return NULL; }
+void navigation_goalrating_end(entity this) { }
+void navigation_goalrating_start(entity this) { }
+void navigation_markroutes(entity this, entity fixed_source_waypoint) { }
+void navigation_markroutes_inverted(entity fixed_source_waypoint) { }
+void navigation_routerating(entity this, entity e, float f, float rangebias) { }
+
+bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float movemode) { return false; }
+
+void waypoint_remove(entity e) { }
+void waypoint_saveall() { }
+void waypoint_schedulerelinkall() { }
+void waypoint_schedulerelink(entity wp) { }
+void waypoint_spawnforitem(entity e) { }
+void waypoint_spawnforitem_force(entity e, vector org) { }
+void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) { }
+void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken) { }
+entity waypoint_spawn(vector m1, vector m2, float f) { return NULL; }

diff --git a/qcsrc/server/bot/null/bot_null.qh b/qcsrc/server/bot/null/bot_null.qh
new file mode 100644 (file)
index 0000000..28709a2
--- /dev/null
+++ b/qcsrc/server/bot/null/bot_null.qh
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "../api.qh"

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 0a608e979bff5da3e4b535fed7019bc0a9fb2301..a280b275e44af1aea83d880e0a47bc5c77d53099 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2489,6 +2489,8 @@ void DrownPlayer(entity this)
        }
 }
 
+.bool move_qcphysics;
+
 void Player_Physics(entity this)
 {
        set_movetype(this, ((this.move_qcphysics) ? MOVETYPE_NONE : this.move_movetype));

diff --git a/qcsrc/server/command/_all.inc b/qcsrc/server/command/_all.inc
new file mode 100644 (file)
index 0000000..b90bed8
--- /dev/null
+++ b/qcsrc/server/command/_all.inc
@@ -0,0 +1,4 @@
+#include <server/command/_all.qh>
+#include "_mod.inc"
+
+#include <common/command/_all.inc>

diff --git a/qcsrc/server/command/_all.qh b/qcsrc/server/command/_all.qh
new file mode 100644 (file)
index 0000000..9b89bcd
--- /dev/null
+++ b/qcsrc/server/command/_all.qh
@@ -0,0 +1,4 @@
+#pragma once
+#include "_mod.qh"
+
+#include <common/command/_all.qh>

diff --git a/qcsrc/server/command/_mod.inc b/qcsrc/server/command/_mod.inc
index fa15432311d98b7a247ca547451b3fbdd6310131..2cabd69c7f8f35fb58e029bb4bb629c85dbf3bbd 100644 (file)
--- a/qcsrc/server/command/_mod.inc
+++ b/qcsrc/server/command/_mod.inc
@@ -1,5 +1,4 @@
 // generated file; do not modify
-#include <server/command/all.qc>
 #include <server/command/banning.qc>
 #include <server/command/cmd.qc>
 #ifdef SVQC
@@ -8,4 +7,5 @@
 #include <server/command/common.qc>
 #include <server/command/getreplies.qc>
 #include <server/command/radarmap.qc>
+#include <server/command/reg.qc>
 #include <server/command/vote.qc>

diff --git a/qcsrc/server/command/_mod.qh b/qcsrc/server/command/_mod.qh
index 60e34ffe521214af8f4e232cd59c93b0a4e406fc..b95b1e0a6edf8158452580375ffaf2b9ab435522 100644 (file)
--- a/qcsrc/server/command/_mod.qh
+++ b/qcsrc/server/command/_mod.qh
@@ -1,8 +1,8 @@
 // generated file; do not modify
-#include <server/command/all.qh>
 #include <server/command/banning.qh>
 #include <server/command/cmd.qh>
 #include <server/command/common.qh>
 #include <server/command/getreplies.qh>
 #include <server/command/radarmap.qh>
+#include <server/command/reg.qh>
 #include <server/command/vote.qh>

diff --git a/qcsrc/server/command/all.qc b/qcsrc/server/command/all.qc
deleted file mode 100644 (file)
index bc15eeb..0000000
--- a/qcsrc/server/command/all.qc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "all.qh"
-#include <common/command/all.qc>

diff --git a/qcsrc/server/command/all.qh b/qcsrc/server/command/all.qh
deleted file mode 100644 (file)
index cde5ef3..0000000
--- a/qcsrc/server/command/all.qh
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <common/command/command.qh>
-REGISTRY(SERVER_COMMANDS, BITS(7))
-#define SERVER_COMMANDS_from(i) _SERVER_COMMANDS_from(i, NULL)
-REGISTER_REGISTRY(SERVER_COMMANDS)
-REGISTRY_SORT(SERVER_COMMANDS)
-
-#define SERVER_COMMAND(id, description) \
-       CLASS(servercommand_##id, Command) \
-               ATTRIB(servercommand_##id, m_name, string, #id); \
-       ATTRIB(servercommand_##id, m_description, string, description); \
-       ENDCLASS(servercommand_##id) \
-    REGISTER(SERVER_COMMANDS, CMD_SV, id, m_id, NEW(servercommand_##id)); \
-       METHOD(servercommand_##id, m_invokecmd, void(servercommand_##id this, int request, entity caller, int arguments, string command))
-
-STATIC_INIT(SERVER_COMMANDS_aliases) {
-       FOREACH(SERVER_COMMANDS, true, LAMBDA(localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_sv"))));
-}
-
-#include "sv_cmd.qh"
-
-#include "banning.qh"
-#include "cmd.qh"
-#include "common.qh"
-#include "getreplies.qh"
-#include "radarmap.qh"
-#include "vote.qh"

diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc
index d6968c262de869826bd4f82db3247e514bbfdd2b..d450ca4c85bed64a76acd79ea75de0821005e2ea 100644 (file)
--- a/qcsrc/server/command/banning.qc
+++ b/qcsrc/server/command/banning.qc
@@ -1,5 +1,5 @@
 #include "banning.qh"
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 #include "banning.qh"
 
 #include "common.qh"

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 13c883f36b8619c79947b229a7322357d0a3d0e0..33f5716658b13a3bff9bb44513f8259b61e80748 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -1,5 +1,5 @@
 #include "cmd.qh"
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 
 #include "common.qh"
 #include "vote.qh"

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index d980a0f4cf2d42334e070e5d0d12e6b7bc11b8e9..8f5b619fd0e254fbdf444346be4072a520dd144e 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -1,5 +1,5 @@
 #include "common.qh"
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 #include "common.qh"
 
 #include "../scores.qh"

diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh
index 63b1c708f21f1bdea6a7fe441988bc2dd57e97bd..0c09006ee32e7248bf98ee8e386ff1d4bcab4e99 100644 (file)
--- a/qcsrc/server/command/common.qh
+++ b/qcsrc/server/command/common.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 REGISTRY(COMMON_COMMANDS, BITS(7))
 #define COMMON_COMMANDS_from(i) _COMMON_COMMANDS_from(i, NULL)
 REGISTER_REGISTRY(COMMON_COMMANDS)
@@ -21,8 +21,7 @@ STATIC_INIT(COMMON_COMMANDS_aliases) {
 #include "vote.qh"
 #include <common/monsters/spawn.qh>
 
-#include <common/command/generic.qh>
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 
 // ============================================================
 //  Shared declarations for server commands, written by Samual

diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index 93ce85a61a89b36b4c849bf2167ae4cebad3cd6f..1274fcf5f7497c61542871a63bf5d0c8d7e7c6b7 100644 (file)
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -1,5 +1,5 @@
 #include "getreplies.qh"
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 #include "getreplies.qh"
 
 #include "../race.qh"

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index 71f5e270b1e80cef9e8aa59d2c0285aa3aa84846..5f7533d7d9442480cec12a225b2e4895fe8e3397 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -1,5 +1,5 @@
 #include "radarmap.qh"
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 #include "radarmap.qh"
 
 #include "../g_world.qh"

diff --git a/qcsrc/server/command/reg.qc b/qcsrc/server/command/reg.qc
new file mode 100644 (file)
index 0000000..c0af5b5
--- /dev/null
+++ b/qcsrc/server/command/reg.qc
@@ -0,0 +1 @@
+#include "reg.qh"

diff --git a/qcsrc/server/command/reg.qh b/qcsrc/server/command/reg.qh
new file mode 100644 (file)
index 0000000..b135c04
--- /dev/null
+++ b/qcsrc/server/command/reg.qh
@@ -0,0 +1,18 @@
+#pragma once
+
+REGISTRY(SERVER_COMMANDS, BITS(7))
+#define SERVER_COMMANDS_from(i) _SERVER_COMMANDS_from(i, NULL)
+REGISTER_REGISTRY(SERVER_COMMANDS)
+REGISTRY_SORT(SERVER_COMMANDS)
+
+#define SERVER_COMMAND(id, description) \
+       CLASS(servercommand_##id, Command) \
+               ATTRIB(servercommand_##id, m_name, string, #id); \
+       ATTRIB(servercommand_##id, m_description, string, description); \
+       ENDCLASS(servercommand_##id) \
+    REGISTER(SERVER_COMMANDS, CMD_SV, id, m_id, NEW(servercommand_##id)); \
+       METHOD(servercommand_##id, m_invokecmd, void(servercommand_##id this, int request, entity caller, int arguments, string command))
+
+STATIC_INIT(SERVER_COMMANDS_aliases) {
+       FOREACH(SERVER_COMMANDS, true, LAMBDA(localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_sv"))));
+}

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index bb59566d2a7e6da9bdf9231589aba6299f4e8f6f..720ad01f63870d83e80828881069b8145fa505cf 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1,5 +1,5 @@
 #include "sv_cmd.qh"
-#include "all.qh"
+#include "_all.qh"
 
 #include "banning.qh"
 #include "cmd.qh"

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 72bedd982ca79797397b9d811b8362752a9b2b95..f93e9c7182be703a68c1e00a542a49506f6e6e25 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -1,5 +1,5 @@
 #include "vote.qh"
-#include <common/command/command.qh>
+#include <common/command/_all.qh>
 #include "vote.qh"
 
 #include "common.qh"

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index fb782ed5c6a242efbba13f0bc72dcb7f9676d9ea..a177cdc64e0cc2d51bbf595a8ed0fd6d4a4556d1 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -9,7 +9,7 @@
 #include "weapons/accuracy.qh"
 #include "weapons/csqcprojectile.qh"
 #include "weapons/selection.qh"
-#include "../common/command/generic.qh"
+#include "../common/command/_all.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/mapinfo.qh"

diff --git a/qcsrc/server/mutators/_all.inc b/qcsrc/server/mutators/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/server/mutators/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/server/mutators/_all.qh b/qcsrc/server/mutators/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/server/mutators/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/server/mutators/all.qc b/qcsrc/server/mutators/all.qc
index 78ba560265e0b17ec95b2d36d578cef9ab6e43fe..0e8a607ebbdb90db1e97de4937b6d70a9fff9715 100644 (file)
--- a/qcsrc/server/mutators/all.qc
+++ b/qcsrc/server/mutators/all.qc
@@ -10,10 +10,7 @@
     #include <common/stats.qh>
     #include <common/teams.qh>
     #include <common/util.qh>
-    #include <common/command/markup.qh>
-    #include <common/command/rpn.qh>
-    #include <common/command/generic.qh>
-    #include <common/command/command.qh>
+    #include <common/command/_all.qh>
     #include <common/net_notice.qh>
     #include <common/animdecide.qh>
     #include <common/monsters/all.qh>

diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh
index 1e60b203e3caa7226883860198bc9f9e130977df..85910ced8c05e1d4dcb10d3edc49a5dc609b35df 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -13,12 +13,10 @@
 
 #include <server/bot/api.qh>
 
-#include <server/command/vote.qh>
+#include <server/command/_all.qh>
 
 #include <common/monsters/all.qh>
 
-#include <server/command/common.qh>
-
 #include <server/weapons/tracing.qh>
 #include <server/weapons/weaponsystem.qh>
 

diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh
index a63321a36a4731d9253021233886c1e4d9c02e84..5344a91bb1ef120609db8d55b070f9a72e68791d 100644 (file)
--- a/qcsrc/server/mutators/mutator.qh
+++ b/qcsrc/server/mutators/mutator.qh
@@ -13,8 +13,7 @@
 
 #include <server/bot/api.qh>
 
-#include <server/command/vote.qh>
-#include <server/command/common.qh>
+#include <server/command/_all.qh>
 
 #include <server/weapons/common.qh>
 #include <server/weapons/tracing.qh>

diff --git a/qcsrc/server/mutators/mutator/_all.inc b/qcsrc/server/mutators/mutator/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/server/mutators/mutator/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/server/mutators/mutator/_all.qh b/qcsrc/server/mutators/mutator/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/server/mutators/mutator/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/server/mutators/mutator/gamemode_lms.qc b/qcsrc/server/mutators/mutator/gamemode_lms.qc
index afd107bc43298c08e5d617a3f924c697b386826d..a66a8c53652dfe5602b241a0a0cc0c2486e7765b 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_lms.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_lms.qc
@@ -43,7 +43,7 @@ float LMS_NewPlayerLives();
 
 #include <common/mutators/mutator/instagib/items.qc>
 #include <server/campaign.qh>
-#include <server/command/cmd.qh>
+#include <server/command/_all.qh>
 
 int autocvar_g_lms_extra_lives;
 bool autocvar_g_lms_join_anytime;

diff --git a/qcsrc/server/pathlib/_all.inc b/qcsrc/server/pathlib/_all.inc
index 7a06615bf34111960753aa2d0a24ad1163cf5265..73539f9ee99cbc2d0566912b00474f0f262b1b50 100644 (file)
--- a/qcsrc/server/pathlib/_all.inc
+++ b/qcsrc/server/pathlib/_all.inc
@@ -1,6 +1,4 @@
-#ifndef DEBUGPATHING
-       #define DEBUGPATHING 0
-#endif
+#include "pathlib.qh"
 
 #include "costs.qc"
 #include "expandnode.qc"

diff --git a/qcsrc/server/pathlib/_all.qh b/qcsrc/server/pathlib/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/server/pathlib/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/server/pathlib/pathlib.qh b/qcsrc/server/pathlib/pathlib.qh
index 339a2e7e0e43c73346741e002c58621874ed9864..4ae0c2c86d4b5f0f2970cf9fdcda76393dfb84bc 100644 (file)
--- a/qcsrc/server/pathlib/pathlib.qh
+++ b/qcsrc/server/pathlib/pathlib.qh
@@ -1,5 +1,9 @@
 #pragma once
 
+#ifndef DEBUGPATHING
+       #define DEBUGPATHING 0
+#endif
+
 .entity pathlib_list;
 .entity path_next;
 .entity path_prev;

diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc
index c49b604e69c0da8660bd9968a6c5680ce9cac6ab..743f981edb151725bbd95de928242cf42e8971a4 100644 (file)
--- a/qcsrc/server/progs.inc
+++ b/qcsrc/server/progs.inc
@@ -1,30 +1,7 @@
-#ifndef DEBUGPATHING
-       #define DEBUGPATHING 0
-#endif
-
 #include <lib/_all.inc>
 
 #if XONOTIC
-
-#include "_all.qh"
-
-#include "../server/_mod.inc"
-#include "bot/_mod.inc"
-#include "command/_mod.inc"
-#include "mutators/_mod.inc"
-#include "pathlib/_all.inc"
-#include "weapons/_mod.inc"
-
-#include <common/_all.inc>
-#include <common/effects/qc/all.qc>
-
-#include <lib/csqcmodel/sv_model.qc>
-
-#include <lib/warpzone/anglestransform.qc>
-#include <lib/warpzone/common.qc>
-#include <lib/warpzone/server.qc>
-#include <lib/warpzone/util_server.qc>
-
+#include "_all.inc"
 #endif
 
 #include <ecs/_lib.inc>

diff --git a/qcsrc/server/tests.qh b/qcsrc/server/tests.qh
index be6445b48e4c696ca82ffef01dd7207807229754..ec56918c795317e6e75c1b5187507f9ec4902094 100644 (file)
--- a/qcsrc/server/tests.qh
+++ b/qcsrc/server/tests.qh
@@ -2,7 +2,7 @@
 
 #include "autocvars.qh"
 #include "cl_client.qh"
-#include "command/all.qh"
+#include "command/_all.qh"
 #include "weapons/common.qh"
 #include "weapons/selection.qh"
 #include <common/items/item.qh>

diff --git a/qcsrc/server/weapons/_all.inc b/qcsrc/server/weapons/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
+++ b/qcsrc/server/weapons/_all.inc
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"

diff --git a/qcsrc/server/weapons/_all.qh b/qcsrc/server/weapons/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
+++ b/qcsrc/server/weapons/_all.qh
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"

diff --git a/qcsrc/tools/auto-super.pl b/qcsrc/tools/auto-super.pl
new file mode 100644 (file)
index 0000000..00926d0
--- /dev/null
+++ b/qcsrc/tools/auto-super.pl
@@ -0,0 +1,101 @@
+my %classoffile = ();
+my %classes = ();
+my %baseclass = ();
+my %methods = ();
+my %attrs = ();
+my %methodnames = ();
+my %old2new = ();
+
+print STDERR "Scanning...\n";
+for my $f(@ARGV)
+{
+       open my $fh, '<', $f;
+       while(<$fh>)
+       {
+               if(/^CLASS\(([^)]*)\)(?:\s*EXTENDS\(([^)]*)\))?/)
+               {
+                       $classes{$1} = defined($2) ? $2 : "Object";
+                       $classoffile{$f} = $1;
+               }
+               if(/^\s*METHOD\(([^),]*),\s*([^),]*)/)
+               {
+                       $methods{$1}{$2} = $1;
+                       $methodnames{"$1"."_"."$2"} = $f;
+                       $old2new{"$2$1"} = "$1"."_"."$2";
+               }
+               if(/^\s*ATTRIB(?:ARRAY)?\(([^),]*),\s*([^),]*)/)
+               {
+                       $attrs{$1}{$2} = $1;
+               }
+       }
+       close $fh;
+}
+
+# propagate down methods etc.
+print STDERR "Propagating...\n";
+for my $class(keys %classes)
+{
+       print STDERR "$class";
+       my $base = $class;
+       for(;;)
+       {
+               $base = $classes{$base};
+               last if not defined $base;
+               print STDERR " -> $base";
+               while(my ($method, $definingclass) = each %{$methods{$base}})
+               {
+                       $methods{$class}{$method} = $definingclass
+                               if not defined $methods{$class}{$method};
+               }
+               while(my ($attr, $definingclass) = each %{$attrs{$base}})
+               {
+                       $attrs{$class}{$attr} = $definingclass
+                               if not defined $attrs{$class}{$attr};
+               }
+       }
+       print STDERR "\n";
+}
+
+# change all calls to base method to super, complain about skipping
+print STDERR "Fixing...\n";
+for my $f(@ARGV)
+{
+       open my $fh, '<', $f;
+       my $s = do { undef local $/; <$fh>; };
+       my $s0 = $s;
+       close $fh;
+
+       my $class = $classoffile{$f};
+       my $base = $classes{$class};
+       next if not defined $base;
+
+       for(keys %old2new)
+       {
+               $s =~ s/\b$_\b/$old2new{$_}/g;
+       }
+
+       my @methods_super = map { [ $methods{$base}{$_} . "_" . $_, "SUPER($class).$_" ]; } keys %{$methods{$base}};
+       for(@methods_super)
+       {
+               my ($search, $replace) = @$_;
+               my $n = ($s =~ s/\b$search\b/$replace/g);
+               print STDERR "[$f] $search -> $replace... $n replacements\n"
+                       if $n;
+       }
+
+       for(grep { $methodnames{$_} ne $f } keys %methodnames)
+       {
+               if($s =~ /\b$_\b/)
+               {
+                       print STDERR "[$f] calls non-super external method directly: $_\n";
+               }
+       }
+
+       if($s ne $s0)
+       {
+               print STDERR "Rewriting $f...\n";
+               open my $fh, '>', $f;
+               print $fh $s;
+               close $fh;
+       }
+}

diff --git a/qcsrc/tools/compilationunits.sh b/qcsrc/tools/compilationunits.sh
index 2fa17825ec1394d8b5efddc7db85513a7c00ca8c..cccb9385676ccf00c73cd173c90e7d8ed1d0e993 100755 (executable)
--- a/qcsrc/tools/compilationunits.sh
+++ b/qcsrc/tools/compilationunits.sh
@@ -11,7 +11,6 @@ declare -a QCCDEFS=(
     -DNDEBUG=1
     -DXONOTIC=1
     -DWATERMARK="\"$(git describe --tags --dirty='~')\""
-    -DDEBUGPATHING=0
 )
 QCCDEFS="${QCCDEFS[@]}"
 

diff --git a/qcsrc/tools/headerstyle.sh b/qcsrc/tools/headerstyle.sh
index daf20ebf3ba748a68be9a1712be73c532f605fa9..e40fb392a86265091052077549fcc7e61d3cb122 100755 (executable)
--- a/qcsrc/tools/headerstyle.sh
+++ b/qcsrc/tools/headerstyle.sh
@@ -28,8 +28,23 @@ function check() {
         echo "$file"
         startswith "$file" "#pragma once"
     done
+    find "$base" -type f -name '_mod.inc' -print0 | sort -z | while read -r -d '' file; do
+        echo "$file"
+        declare -l file_inc="${file%_mod.inc}_all.inc"
+        if [ ! -f "$file_inc" ]; then
+            echo '#include "_all.qh"' > "$file_inc"
+            echo '#include "_mod.inc"' >> "$file_inc"
+        fi
+        declare -l file_qh="${file%_mod.inc}_all.qh"
+        if [ ! -f "$file_qh" ]; then
+            echo '#pragma once' > "$file_qh"
+            echo '#include "_mod.qh"' >> "$file_qh"
+        fi
+    done
 }
 
 check client
 check server
 check menu
+
+# TODO: check that "_mod.(qc|inc)" is not included except by "_all.(qc|inc)"