Remove _all indirection
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 20 Aug 2016 14:46:22 +0000 (00:46 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 21 Aug 2016 04:08:36 +0000 (14:08 +1000)
224 files changed:
qcsrc/client/_all.inc
qcsrc/client/commands/_all.inc [deleted file]
qcsrc/client/commands/_all.qh [deleted file]
qcsrc/client/commands/cl_cmd.qc
qcsrc/client/hud/_all.inc [deleted file]
qcsrc/client/hud/_all.qh [deleted file]
qcsrc/client/hud/_mod.inc
qcsrc/client/hud/_mod.qh
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud.qh
qcsrc/client/hud/panel/_all.inc [deleted file]
qcsrc/client/hud/panel/_all.qh [deleted file]
qcsrc/client/hud/panel/powerups.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/mutators/_all.inc [deleted file]
qcsrc/client/mutators/_all.qh [deleted file]
qcsrc/client/progs.inc
qcsrc/client/shownames.qc
qcsrc/client/teamradar.qc
qcsrc/client/view.qc
qcsrc/client/weapons/_all.inc [deleted file]
qcsrc/client/weapons/_all.qh [deleted file]
qcsrc/common/_all.inc
qcsrc/common/command/_all.inc [deleted file]
qcsrc/common/command/_all.qh [deleted file]
qcsrc/common/command/generic.qc
qcsrc/common/effects/_mod.inc
qcsrc/common/effects/_mod.qh
qcsrc/common/effects/qc/damageeffects.qc
qcsrc/common/gamemodes/_all.inc [deleted file]
qcsrc/common/gamemodes/_all.qh [deleted file]
qcsrc/common/gamemodes/_mod.inc
qcsrc/common/gamemodes/_mod.qh
qcsrc/common/gamemodes/gamemode/_all.inc [deleted file]
qcsrc/common/gamemodes/gamemode/_all.qh [deleted file]
qcsrc/common/gamemodes/gamemode/_mod.inc
qcsrc/common/gamemodes/gamemode/_mod.qh
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
qcsrc/common/items/_all.inc [deleted file]
qcsrc/common/items/_all.qh [deleted file]
qcsrc/common/items/_mod.inc
qcsrc/common/items/_mod.qh
qcsrc/common/items/all.qc
qcsrc/common/items/all.qh
qcsrc/common/items/item/_all.inc [deleted file]
qcsrc/common/items/item/_all.qh [deleted file]
qcsrc/common/items/item/ammo.qc
qcsrc/common/items/item/ammo.qh
qcsrc/common/items/item/armor.qc
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qc
qcsrc/common/items/item/health.qh
qcsrc/common/items/item/jetpack.qc
qcsrc/common/items/item/jetpack.qh
qcsrc/common/items/item/pickup.qh
qcsrc/common/items/item/powerup.qc
qcsrc/common/items/item/powerup.qh
qcsrc/common/mapinfo.qc
qcsrc/common/minigames/_mod.inc
qcsrc/common/minigames/_mod.qh
qcsrc/common/monsters/_all.inc [new file with mode: 0644]
qcsrc/common/monsters/_all.qh [new file with mode: 0644]
qcsrc/common/monsters/all.qc
qcsrc/common/monsters/all.qh
qcsrc/common/monsters/monster/_all.inc [deleted file]
qcsrc/common/monsters/monster/_all.qh [deleted file]
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/_all.inc [deleted file]
qcsrc/common/mutators/_all.qh [deleted file]
qcsrc/common/mutators/_mod.inc
qcsrc/common/mutators/_mod.qh
qcsrc/common/mutators/mutator/_all.inc [deleted file]
qcsrc/common/mutators/mutator/_all.qh [deleted file]
qcsrc/common/mutators/mutator/_mod.inc
qcsrc/common/mutators/mutator/_mod.qh
qcsrc/common/mutators/mutator/buffs/buffs.qh
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/instagib/items.qh
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh
qcsrc/common/notifications/all.qc
qcsrc/common/notifications/all.qh
qcsrc/common/physics/_mod.inc
qcsrc/common/physics/_mod.qh
qcsrc/common/playerstats.qc
qcsrc/common/t_items.qc
qcsrc/common/triggers/_mod.inc
qcsrc/common/triggers/_mod.qh
qcsrc/common/triggers/trigger/swamp.qc
qcsrc/common/turrets/_all.inc [new file with mode: 0644]
qcsrc/common/turrets/_all.qh [new file with mode: 0644]
qcsrc/common/turrets/all.qc
qcsrc/common/turrets/all.qh
qcsrc/common/turrets/turret.qh
qcsrc/common/turrets/turret/_all.inc [deleted file]
qcsrc/common/turrets/turret/_all.qh [deleted file]
qcsrc/common/vehicles/_all.inc [new file with mode: 0644]
qcsrc/common/vehicles/_all.qh [new file with mode: 0644]
qcsrc/common/vehicles/all.qc
qcsrc/common/vehicles/all.qh
qcsrc/common/vehicles/vehicle/_all.inc [deleted file]
qcsrc/common/vehicles/vehicle/_all.qh [deleted file]
qcsrc/common/vehicles/vehicle/bumblebee_weapons.qh
qcsrc/common/vehicles/vehicle/racer_weapon.qh
qcsrc/common/vehicles/vehicle/raptor_weapons.qh
qcsrc/common/vehicles/vehicle/spiderbot_weapons.qh
qcsrc/common/weapons/_all.inc [new file with mode: 0644]
qcsrc/common/weapons/_all.qh [new file with mode: 0644]
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/calculations.qc
qcsrc/common/weapons/calculations.qh
qcsrc/common/weapons/weapon.qh
qcsrc/ecs/_lib.inc [deleted file]
qcsrc/ecs/_lib.qh [deleted file]
qcsrc/ecs/_mod.inc
qcsrc/ecs/_mod.qh
qcsrc/ecs/lib.qh [new file with mode: 0644]
qcsrc/ecs/main.qh
qcsrc/lib/_all.inc
qcsrc/lib/matrix/_all.inc [deleted file]
qcsrc/lib/matrix/_all.qh [deleted file]
qcsrc/lib/warpzone/common.qc
qcsrc/lib/warpzone/server.qc
qcsrc/menu/_all.inc
qcsrc/menu/anim/_all.inc [deleted file]
qcsrc/menu/anim/_all.qh [deleted file]
qcsrc/menu/command/_all.inc [deleted file]
qcsrc/menu/command/_all.qh [deleted file]
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/item/_all.inc [deleted file]
qcsrc/menu/item/_all.qh [deleted file]
qcsrc/menu/menu.qc
qcsrc/menu/mutators/_all.inc [deleted file]
qcsrc/menu/mutators/_all.qh [deleted file]
qcsrc/menu/xonotic/_all.inc [deleted file]
qcsrc/menu/xonotic/_all.qh [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/keybinder.qc
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/weaponslist.qc
qcsrc/server/_all.inc
qcsrc/server/bot/_all.inc [deleted file]
qcsrc/server/bot/_all.qh [deleted file]
qcsrc/server/bot/_mod.inc
qcsrc/server/bot/_mod.qh
qcsrc/server/bot/api.qh
qcsrc/server/bot/default/_all.inc [deleted file]
qcsrc/server/bot/default/_all.qh [deleted file]
qcsrc/server/bot/default/_mod.inc
qcsrc/server/bot/default/_mod.qh
qcsrc/server/bot/default/aim.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/havocbot/_all.inc [deleted file]
qcsrc/server/bot/default/havocbot/_all.qh [deleted file]
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/navigation.qc
qcsrc/server/bot/null/bot_null.qc
qcsrc/server/cheats.qc
qcsrc/server/client.qc
qcsrc/server/command/_all.inc [deleted file]
qcsrc/server/command/_all.qh [deleted file]
qcsrc/server/command/banning.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/common.qh
qcsrc/server/command/getreplies.qc
qcsrc/server/command/radarmap.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_damage.qh
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/impulse.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/_all.inc [deleted file]
qcsrc/server/mutators/_all.qh [deleted file]
qcsrc/server/mutators/_mod.inc
qcsrc/server/mutators/_mod.qh
qcsrc/server/mutators/gamemode.qh
qcsrc/server/mutators/mutator.qh
qcsrc/server/mutators/mutator/_all.inc [deleted file]
qcsrc/server/mutators/mutator/_all.qh [deleted file]
qcsrc/server/mutators/mutator/gamemode_lms.qc
qcsrc/server/pathlib/_all.inc [deleted file]
qcsrc/server/pathlib/_all.qh [deleted file]
qcsrc/server/pathlib/costs.qc
qcsrc/server/pathlib/costs.qh
qcsrc/server/pathlib/debug.qc
qcsrc/server/pathlib/debug.qh
qcsrc/server/portals.qc
qcsrc/server/progs.inc
qcsrc/server/scores.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/sv_main.qc
qcsrc/server/t_quake.qc
qcsrc/server/t_quake3.qc
qcsrc/server/teamplay.qc
qcsrc/server/tests.qh
qcsrc/server/weapons/_all.inc [deleted file]
qcsrc/server/weapons/_all.qh [deleted file]
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/common.qc
qcsrc/server/weapons/csqcprojectile.qc
qcsrc/server/weapons/hitplot.qc
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/throwing.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponstats.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/tools/genmod.sh
qcsrc/tools/headerstyle.sh

index 0c401ac..f592f8a 100644 (file)
@@ -1,10 +1,10 @@
 #include <client/_all.qh>
 #include "_mod.inc"
 
-#include "commands/_all.inc"
-#include "hud/_all.inc"
-#include "mutators/_all.inc"
-#include "weapons/_all.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>
diff --git a/qcsrc/client/commands/_all.inc b/qcsrc/client/commands/_all.inc
deleted file mode 100644 (file)
index c90682d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#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
deleted file mode 100644 (file)
index 9b89bcd..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include <common/command/_all.qh>
index 4c8e915..631090c 100644 (file)
@@ -4,12 +4,12 @@
 //  Last updated: December 28th, 2011
 // ==============================================
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include "cl_cmd.qh"
 
 #include "../autocvars.qh"
 #include "../defs.qh"
-#include <client/hud/_all.qh>
+#include <client/hud/_mod.qh>
 #include "../main.qh"
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"
diff --git a/qcsrc/client/hud/_all.inc b/qcsrc/client/hud/_all.inc
deleted file mode 100644 (file)
index 9988f9a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#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
deleted file mode 100644 (file)
index 4ace83e..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include "panel/_all.qh"
index f400d5d..aa785a9 100644 (file)
@@ -2,3 +2,5 @@
 #include <client/hud/hud.qc>
 #include <client/hud/hud_config.qc>
 #include <client/hud/panel.qc>
+
+#include <client/hud/panel/_mod.inc>
index 0ac7251..2d4850d 100644 (file)
@@ -2,3 +2,5 @@
 #include <client/hud/hud.qh>
 #include <client/hud/hud_config.qh>
 #include <client/hud/panel.qh>
+
+#include <client/hud/panel/_mod.qh>
index 760f5d4..8b23dd6 100644 (file)
@@ -7,7 +7,7 @@
 #include "../teamradar.qh"
 #include <common/t_items.qh>
 #include <common/deathtypes/all.qh>
-#include <common/items/all.qc>
+#include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
 #include <common/vehicles/all.qh>
 #include <common/mutators/mutator/waypoints/all.qh>
index a895af3..0dc89a8 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 bool HUD_Radar_Clickable();
 void HUD_Radar_Mouse();
diff --git a/qcsrc/client/hud/panel/_all.inc b/qcsrc/client/hud/panel/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/client/hud/panel/_all.qh b/qcsrc/client/hud/panel/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 223bf72..7f8703f 100644 (file)
@@ -1,6 +1,6 @@
 #include "powerups.qh"
 
-#include <common/items/all.qc>
+#include <common/items/_mod.qh>
 
 // Powerups (#2)
 
index 1ceab88..22a9827 100644 (file)
@@ -2,7 +2,7 @@
 // QuickMenu (#23)
 
 #include <common/ent_cs.qh>
-#include <client/hud/_all.qh>
+#include <client/hud/_mod.qh>
 #include <client/mapvoting.qh>
 
 // QUICKMENU_MAXLINES must be <= 10
index b23a770..d495480 100644 (file)
@@ -1,7 +1,7 @@
 #include "main.qh"
 
 #include <common/effects/qc/all.qh>
-#include "hud/_all.qh"
+#include "hud/_mod.qh"
 #include "mapvoting.qh"
 #include "mutators/events.qh"
 #include "hud/panel/scoreboard.qh"
@@ -11,7 +11,7 @@
 #include "wall.qh"
 #include "weapons/projectile.qh"
 #include <common/deathtypes/all.qh>
-#include <common/items/all.qh>
+#include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
 #include <common/minigames/cl_minigames.qh>
 #include <common/minigames/cl_minigames_hud.qh>
index afd0b5e..4916784 100644 (file)
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <common/constants.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 // --------------------------------------------------------------------------
 // MENU Functionality
index c397c88..89f5407 100644 (file)
@@ -1,6 +1,6 @@
 #include "mapvoting.qh"
 
-#include "hud/_all.qh"
+#include "hud/_mod.qh"
 #include "hud/panel/scoreboard.qh"
 
 #include <common/mapinfo.qh>
index 9b98332..33fd015 100644 (file)
@@ -1,8 +1,8 @@
 #include "miscfunctions.qh"
 
-#include "hud/_all.qh"
+#include "hud/_mod.qh"
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 
 #include <common/teams.qh>
 
diff --git a/qcsrc/client/mutators/_all.inc b/qcsrc/client/mutators/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/client/mutators/_all.qh b/qcsrc/client/mutators/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index cd08bf1..7341a01 100644 (file)
@@ -4,7 +4,7 @@
 #include "_all.inc"
 #endif
 
-#include <ecs/_lib.inc>
+#include <ecs/_mod.inc>
 
 #if BUILD_MOD
 #include "../../mod/client/progs.inc"
index 9797abf..75ef405 100644 (file)
@@ -1,6 +1,6 @@
 #include "shownames.qh"
 
-#include "hud/_all.qh"
+#include "hud/_mod.qh"
 
 #include <common/ent_cs.qh>
 #include <common/constants.qh>
index 84fba6c..9c4544b 100644 (file)
@@ -1,6 +1,6 @@
 #include "teamradar.qh"
 
-#include "hud/_all.qh"
+#include "hud/_mod.qh"
 
 #include <common/mutators/mutator/waypoints/all.qh>
 
index 86b2db1..336707d 100644 (file)
@@ -1,7 +1,7 @@
 #include "view.qh"
 
 #include "announcer.qh"
-#include "hud/_all.qh"
+#include "hud/_mod.qh"
 #include "mapvoting.qh"
 #include "shownames.qh"
 #include "hud/panel/scoreboard.qh"
 #include <common/constants.qh>
 #include <common/debug.qh>
 #include <common/mapinfo.qh>
-#include <common/gamemodes/_all.qh>
+#include <common/gamemodes/_mod.qh>
 #include <common/physics/player.qh>
 #include <common/stats.qh>
 #include <common/triggers/target/music.qh>
 #include <common/teams.qh>
 
 #include <common/vehicles/all.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/viewloc.qh>
 #include <common/minigames/cl_minigames.qh>
 #include <common/minigames/cl_minigames_hud.qh>
diff --git a/qcsrc/client/weapons/_all.inc b/qcsrc/client/weapons/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/client/weapons/_all.qh b/qcsrc/client/weapons/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index ef1e03e..7b284dc 100644 (file)
@@ -31,6 +31,8 @@ float autocvar_net_connecttimeout = 30;
 
 #include "debug.qh"
 
+#include "command/_mod.inc"
+
 #ifndef MENUQC
 #include "deathtypes/all.qc"
 #include "effects/all.qc"
@@ -39,11 +41,11 @@ float autocvar_net_connecttimeout = 30;
 #include "t_items.qc"
 #endif
 
-#include "items/_all.inc"
-    #include "weapons/all.qc"
+#include "items/_mod.inc"
+    #include "weapons/_all.inc"
         #include "monsters/all.qc"
         #include "turrets/all.qc"
         #include "vehicles/all.qc"
 
-#include "mutators/_all.inc"
-    #include "gamemodes/_all.inc"
+#include "mutators/_mod.inc"
+    #include "gamemodes/_mod.inc"
diff --git a/qcsrc/common/command/_all.inc b/qcsrc/common/command/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/common/command/_all.qh b/qcsrc/common/command/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 5693329..2fcdf0c 100644 (file)
@@ -1,4 +1,4 @@
-#include "_all.qh"
+#include "_mod.qh"
 #include "reg.qh"
 
 #include "markup.qh"
@@ -15,7 +15,7 @@
 #endif
 
 #ifdef SVQC
-       #include <server/command/_all.qh>
+       #include <server/command/_mod.qh>
        #include <common/turrets/config.qh>
        #include <common/weapons/config.qh>
 #endif
index 6975259..d5dab8c 100644 (file)
@@ -1,3 +1,5 @@
 // generated file; do not modify
 #include <common/effects/all.qc>
 #include <common/effects/effectinfo.qc>
+
+#include <common/effects/qc/_mod.inc>
index 3f5ed82..8d6e8ed 100644 (file)
@@ -1,3 +1,5 @@
 // generated file; do not modify
 #include <common/effects/all.qh>
 #include <common/effects/effectinfo.qh>
+
+#include <common/effects/qc/_mod.qh>
index d17502e..b72f38e 100644 (file)
@@ -6,7 +6,7 @@
 #include <common/physics/movetypes/movetypes.qh>
 #include <client/mutators/events.qh>
 #include <common/vehicles/all.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #endif
 
 #endif
diff --git a/qcsrc/common/gamemodes/_all.inc b/qcsrc/common/gamemodes/_all.inc
deleted file mode 100644 (file)
index 21f512a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
-
-#include "gamemode/_all.inc"
diff --git a/qcsrc/common/gamemodes/_all.qh b/qcsrc/common/gamemodes/_all.qh
deleted file mode 100644 (file)
index 8aed6ca..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include "gamemode/_all.qh"
index 98fb481..c3cec69 100644 (file)
@@ -1 +1,3 @@
 // generated file; do not modify
+
+#include <common/gamemodes/gamemode/_mod.inc>
index 98fb481..685c277 100644 (file)
@@ -1 +1,3 @@
 // generated file; do not modify
+
+#include <common/gamemodes/gamemode/_mod.qh>
diff --git a/qcsrc/common/gamemodes/gamemode/_all.inc b/qcsrc/common/gamemodes/gamemode/_all.inc
deleted file mode 100644 (file)
index 7c51f95..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
-
-#include "nexball/_mod.inc"
-#include "onslaught/_mod.inc"
diff --git a/qcsrc/common/gamemodes/gamemode/_all.qh b/qcsrc/common/gamemodes/gamemode/_all.qh
deleted file mode 100644 (file)
index dd16f04..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include "nexball/_mod.qh"
-#include "onslaught/_mod.qh"
index 98fb481..2fc2c40 100644 (file)
@@ -1 +1,4 @@
 // generated file; do not modify
+
+#include <common/gamemodes/gamemode/nexball/_mod.inc>
+#include <common/gamemodes/gamemode/onslaught/_mod.inc>
index 98fb481..d799570 100644 (file)
@@ -1 +1,4 @@
 // generated file; do not modify
+
+#include <common/gamemodes/gamemode/nexball/_mod.qh>
+#include <common/gamemodes/gamemode/onslaught/_mod.qh>
diff --git a/qcsrc/common/items/_all.inc b/qcsrc/common/items/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/common/items/_all.qh b/qcsrc/common/items/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 3b5dd95..6214fac 100644 (file)
@@ -1,2 +1,4 @@
 // generated file; do not modify
 #include <common/items/all.qc>
+
+#include <common/items/item/_mod.inc>
index 158814c..a04e90b 100644 (file)
@@ -1,2 +1,4 @@
 // generated file; do not modify
 #include <common/items/all.qh>
+
+#include <common/items/item/_mod.qh>
index ab77f30..7782cda 100644 (file)
@@ -1,9 +1,5 @@
-#ifndef ITEMS_ALL_C
-#define ITEMS_ALL_C
 #include "all.qh"
 
-#include "item/_all.inc"
-
 void Dump_Items()
 {
     FOREACH(Items, true, ITEM_HANDLE(Show, it));
@@ -18,5 +14,3 @@ string Item_Model(string item_mdl)
 #endif
     return output;
 }
-
-#endif
index 73bd502..41cd424 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 
 #include "item.qh"
 
diff --git a/qcsrc/common/items/item/_all.inc b/qcsrc/common/items/item/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/common/items/item/_all.qh b/qcsrc/common/items/item/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 525a5b3..d7e0dcc 100644 (file)
@@ -1,84 +1 @@
 #include "ammo.qh"
-#ifdef SVQC
-    #include <common/t_items.qh>
-#endif
-
-#ifndef MENUQC
-MODEL(Bullets_ITEM, Item_Model("a_bullets.mdl"));
-#endif
-
-REGISTER_ITEM(Bullets, Ammo) {
-#ifndef MENUQC
-    this.m_model    =   MDL_Bullets_ITEM;
-#endif
-    this.m_name     =   "bullets";
-    this.m_icon     =   "ammo_bullets";
-#ifdef SVQC
-    this.m_botvalue =   2000;
-    this.m_itemid   =   IT_NAILS;
-#endif
-}
-
-#ifndef MENUQC
-MODEL(Cells_ITEM, Item_Model("a_cells.md3"));
-#endif
-
-REGISTER_ITEM(Cells, Ammo) {
-#ifndef MENUQC
-    this.m_model    =   MDL_Cells_ITEM;
-#endif
-    this.m_name     =   "cells";
-    this.m_icon     =   "ammo_cells";
-#ifdef SVQC
-    this.m_botvalue =   2000;
-    this.m_itemid   =   IT_CELLS;
-#endif
-}
-
-#ifndef MENUQC
-MODEL(Plasma_ITEM, Item_Model("a_cells.md3"));
-#endif
-
-REGISTER_ITEM(Plasma, Ammo) {
-#ifndef MENUQC
-    this.m_model    =   MDL_Plasma_ITEM;
-#endif
-    this.m_name     =   "plasma";
-    this.m_icon     =   "ammo_plasma";
-#ifdef SVQC
-    this.m_botvalue =   2000;
-    this.m_itemid   =   IT_PLASMA;
-#endif
-}
-
-#ifndef MENUQC
-MODEL(Rockets_ITEM, Item_Model("a_rockets.md3"));
-#endif
-
-REGISTER_ITEM(Rockets, Ammo) {
-#ifndef MENUQC
-    this.m_model    =   MDL_Rockets_ITEM;
-#endif
-    this.m_name     =   "rockets";
-    this.m_icon     =   "ammo_rockets";
-#ifdef SVQC
-    this.m_botvalue =   3000;
-    this.m_itemid   =   IT_ROCKETS;
-#endif
-}
-
-#ifndef MENUQC
-MODEL(Shells_ITEM, Item_Model("a_shells.md3"));
-#endif
-
-REGISTER_ITEM(Shells, Ammo) {
-#ifndef MENUQC
-    this.m_model    =   MDL_Shells_ITEM;
-#endif
-    this.m_name     =   "shells";
-    this.m_icon     =   "ammo_shells";
-#ifdef SVQC
-    this.m_botvalue =   500;
-    this.m_itemid   =   IT_SHELLS;
-#endif
-}
index 56c9369..d2ef10a 100644 (file)
@@ -8,3 +8,87 @@ CLASS(Ammo, Pickup)
     ATTRIB(Ammo, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_ammo));
 #endif
 ENDCLASS(Ammo)
+
+#ifdef SVQC
+    #include <common/t_items.qh>
+#endif
+
+#ifndef MENUQC
+MODEL(Bullets_ITEM, Item_Model("a_bullets.mdl"));
+#endif
+
+REGISTER_ITEM(Bullets, Ammo) {
+#ifndef MENUQC
+    this.m_model    =   MDL_Bullets_ITEM;
+#endif
+    this.m_name     =   "bullets";
+    this.m_icon     =   "ammo_bullets";
+#ifdef SVQC
+    this.m_botvalue =   2000;
+    this.m_itemid   =   IT_NAILS;
+#endif
+}
+
+#ifndef MENUQC
+MODEL(Cells_ITEM, Item_Model("a_cells.md3"));
+#endif
+
+REGISTER_ITEM(Cells, Ammo) {
+#ifndef MENUQC
+    this.m_model    =   MDL_Cells_ITEM;
+#endif
+    this.m_name     =   "cells";
+    this.m_icon     =   "ammo_cells";
+#ifdef SVQC
+    this.m_botvalue =   2000;
+    this.m_itemid   =   IT_CELLS;
+#endif
+}
+
+#ifndef MENUQC
+MODEL(Plasma_ITEM, Item_Model("a_cells.md3"));
+#endif
+
+REGISTER_ITEM(Plasma, Ammo) {
+#ifndef MENUQC
+    this.m_model    =   MDL_Plasma_ITEM;
+#endif
+    this.m_name     =   "plasma";
+    this.m_icon     =   "ammo_plasma";
+#ifdef SVQC
+    this.m_botvalue =   2000;
+    this.m_itemid   =   IT_PLASMA;
+#endif
+}
+
+#ifndef MENUQC
+MODEL(Rockets_ITEM, Item_Model("a_rockets.md3"));
+#endif
+
+REGISTER_ITEM(Rockets, Ammo) {
+#ifndef MENUQC
+    this.m_model    =   MDL_Rockets_ITEM;
+#endif
+    this.m_name     =   "rockets";
+    this.m_icon     =   "ammo_rockets";
+#ifdef SVQC
+    this.m_botvalue =   3000;
+    this.m_itemid   =   IT_ROCKETS;
+#endif
+}
+
+#ifndef MENUQC
+MODEL(Shells_ITEM, Item_Model("a_shells.md3"));
+#endif
+
+REGISTER_ITEM(Shells, Ammo) {
+#ifndef MENUQC
+    this.m_model    =   MDL_Shells_ITEM;
+#endif
+    this.m_name     =   "shells";
+    this.m_icon     =   "ammo_shells";
+#ifdef SVQC
+    this.m_botvalue =   500;
+    this.m_itemid   =   IT_SHELLS;
+#endif
+}
index f8669e0..cca0b54 100644 (file)
@@ -1,89 +1 @@
 #include "armor.qh"
-#ifdef SVQC
-    #include <common/t_items.qh>
-#endif
-
-#ifndef MENUQC
-MODEL(ArmorSmall_ITEM, Item_Model("item_armor_small.md3"));
-SOUND(ArmorSmall, "misc/armor1");
-#endif
-
-REGISTER_ITEM(ArmorSmall, Armor) {
-#ifndef MENUQC
-    this.m_model                =   MDL_ArmorSmall_ITEM;
-    this.m_sound                =   SND_ArmorSmall;
-#endif
-    this.m_name                 =   "5 Armor";
-    this.m_icon                 =   "armor";
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
-    this.m_itemid               =   IT_ARMOR_SHARD;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
-#endif
-}
-
-#ifndef MENUQC
-MODEL(ArmorMedium_ITEM, Item_Model("item_armor_medium.md3"));
-SOUND(ArmorMedium, "misc/armor10");
-#endif
-
-REGISTER_ITEM(ArmorMedium, Armor) {
-#ifndef MENUQC
-    this.m_model                =   MDL_ArmorMedium_ITEM;
-    this.m_sound                =   SND_ArmorMedium;
-#endif
-    this.m_name                 =   "25 Armor";
-    this.m_icon                 =   "armor";
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_MID;
-    this.m_itemid               =   IT_ARMOR;
-    this.m_respawntime          =   GET(g_pickup_respawntime_medium);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
-#endif
-}
-
-#ifndef MENUQC
-MODEL(ArmorLarge_ITEM, Item_Model("item_armor_big.md3"));
-SOUND(ArmorLarge, "misc/armor17_5");
-#endif
-
-REGISTER_ITEM(ArmorLarge, Armor) {
-#ifndef MENUQC
-    this.m_model                =   MDL_ArmorLarge_ITEM;
-    this.m_sound                =   SND_ArmorLarge;
-#endif
-    this.m_name                 =   "50 Armor";
-    this.m_icon                 =   "armor";
-    this.m_color                =   '0 1 0';
-    this.m_waypoint             =   _("Large armor");
-#ifdef SVQC
-    this.m_botvalue             =   20000; // FIXME: higher than BOT_PICKUP_RATING_HIGH?
-    this.m_itemid               =   IT_ARMOR;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
-#endif
-}
-
-#ifndef MENUQC
-MODEL(ArmorMega_ITEM, Item_Model("item_armor_large.md3"));
-SOUND(ArmorMega, "misc/armor25");
-#endif
-
-REGISTER_ITEM(ArmorMega, Armor) {
-#ifndef MENUQC
-    this.m_model                =   MDL_ArmorMega_ITEM;
-    this.m_sound                =   SND_ArmorMega;
-#endif
-    this.m_name                 =   "100 Armor";
-    this.m_icon                 =   "item_large_armor";
-    this.m_color                =   '0 1 0';
-    this.m_waypoint             =   _("Mega armor");
-    this.m_waypointblink        =   2;
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
-    this.m_itemid               =   IT_ARMOR;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
-#endif
-}
index 9078b63..cb41abc 100644 (file)
@@ -8,3 +8,92 @@ CLASS(Armor, Pickup)
     ATTRIB(Armor, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc);
 #endif
 ENDCLASS(Armor)
+
+#ifdef SVQC
+    #include <common/t_items.qh>
+#endif
+
+#ifndef MENUQC
+MODEL(ArmorSmall_ITEM, Item_Model("item_armor_small.md3"));
+SOUND(ArmorSmall, "misc/armor1");
+#endif
+
+REGISTER_ITEM(ArmorSmall, Armor) {
+#ifndef MENUQC
+    this.m_model                =   MDL_ArmorSmall_ITEM;
+    this.m_sound                =   SND_ArmorSmall;
+#endif
+    this.m_name                 =   "5 Armor";
+    this.m_icon                 =   "armor";
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
+    this.m_itemid               =   IT_ARMOR_SHARD;
+    this.m_respawntime          =   GET(g_pickup_respawntime_short);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
+#endif
+}
+
+#ifndef MENUQC
+MODEL(ArmorMedium_ITEM, Item_Model("item_armor_medium.md3"));
+SOUND(ArmorMedium, "misc/armor10");
+#endif
+
+REGISTER_ITEM(ArmorMedium, Armor) {
+#ifndef MENUQC
+    this.m_model                =   MDL_ArmorMedium_ITEM;
+    this.m_sound                =   SND_ArmorMedium;
+#endif
+    this.m_name                 =   "25 Armor";
+    this.m_icon                 =   "armor";
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_MID;
+    this.m_itemid               =   IT_ARMOR;
+    this.m_respawntime          =   GET(g_pickup_respawntime_medium);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
+#endif
+}
+
+#ifndef MENUQC
+MODEL(ArmorLarge_ITEM, Item_Model("item_armor_big.md3"));
+SOUND(ArmorLarge, "misc/armor17_5");
+#endif
+
+REGISTER_ITEM(ArmorLarge, Armor) {
+#ifndef MENUQC
+    this.m_model                =   MDL_ArmorLarge_ITEM;
+    this.m_sound                =   SND_ArmorLarge;
+#endif
+    this.m_name                 =   "50 Armor";
+    this.m_icon                 =   "armor";
+    this.m_color                =   '0 1 0';
+    this.m_waypoint             =   _("Large armor");
+#ifdef SVQC
+    this.m_botvalue             =   20000; // FIXME: higher than BOT_PICKUP_RATING_HIGH?
+    this.m_itemid               =   IT_ARMOR;
+    this.m_respawntime          =   GET(g_pickup_respawntime_long);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
+#endif
+}
+
+#ifndef MENUQC
+MODEL(ArmorMega_ITEM, Item_Model("item_armor_large.md3"));
+SOUND(ArmorMega, "misc/armor25");
+#endif
+
+REGISTER_ITEM(ArmorMega, Armor) {
+#ifndef MENUQC
+    this.m_model                =   MDL_ArmorMega_ITEM;
+    this.m_sound                =   SND_ArmorMega;
+#endif
+    this.m_name                 =   "100 Armor";
+    this.m_icon                 =   "item_large_armor";
+    this.m_color                =   '0 1 0';
+    this.m_waypoint             =   _("Mega armor");
+    this.m_waypointblink        =   2;
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
+    this.m_itemid               =   IT_ARMOR;
+    this.m_respawntime          =   GET(g_pickup_respawntime_long);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
+#endif
+}
index 93ba2f3..49a34c1 100644 (file)
@@ -1,89 +1 @@
 #include "health.qh"
-#ifdef SVQC
-    #include <common/t_items.qh>
-#endif
-
-#ifndef MENUQC
-MODEL(HealthSmall_ITEM, Item_Model("g_h1.md3"));
-SOUND(HealthSmall, "misc/minihealth");
-#endif
-
-REGISTER_ITEM(HealthSmall, Health) {
-#ifndef MENUQC
-    this.m_model                =   MDL_HealthSmall_ITEM;
-    this.m_sound                =   SND_HealthSmall;
-#endif
-    this.m_name                 =   "5 Health";
-    this.m_icon                 =   "health";
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
-    this.m_itemid               =   IT_5HP;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
-#endif
-}
-
-#ifndef MENUQC
-MODEL(HealthMedium_ITEM, Item_Model("g_h25.md3"));
-SOUND(HealthMedium, "misc/mediumhealth");
-#endif
-
-REGISTER_ITEM(HealthMedium, Health) {
-#ifndef MENUQC
-    this.m_model                =   MDL_HealthMedium_ITEM;
-    this.m_sound                =   SND_HealthMedium;
-#endif
-    this.m_name                 =   "25 Health";
-    this.m_icon                 =   "health";
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_MID;
-    this.m_itemid               =   IT_25HP;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
-#endif
-}
-
-#ifndef MENUQC
-MODEL(HealthLarge_ITEM, Item_Model("g_h50.md3"));
-SOUND(HealthLarge, "misc/mediumhealth");
-#endif
-
-REGISTER_ITEM(HealthLarge, Health) {
-#ifndef MENUQC
-    this.m_model                =   MDL_HealthLarge_ITEM;
-    this.m_sound                =   SND_HealthLarge;
-#endif
-    this.m_name                 =   "50 Health";
-    this.m_icon                 =   "health";
-    this.m_color                =   '1 0 0';
-    this.m_waypoint             =   _("Large health");
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_MID;
-    this.m_itemid               =   IT_25HP;
-    this.m_respawntime          =   GET(g_pickup_respawntime_medium);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
-#endif
-}
-
-#ifndef MENUQC
-MODEL(HealthMega_ITEM, Item_Model("g_h100.md3"));
-SOUND(HealthMega, "misc/megahealth");
-#endif
-
-REGISTER_ITEM(HealthMega, Health) {
-#ifndef MENUQC
-    this.m_model                =   MDL_HealthMega_ITEM;
-    this.m_sound                =   SND_HealthMega;
-#endif
-    this.m_name                 =   "100 Health";
-    this.m_icon                 =   "item_mega_health";
-    this.m_color                =   '1 0 0';
-    this.m_waypoint             =   _("Mega health");
-    this.m_waypointblink        =   2;
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
-    this.m_itemid               =   IT_HEALTH;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
-#endif
-}
index 8eb463a..7993387 100644 (file)
@@ -8,3 +8,92 @@ CLASS(Health, Pickup)
     ATTRIB(Health, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc);
 #endif
 ENDCLASS(Health)
+
+#ifdef SVQC
+    #include <common/t_items.qh>
+#endif
+
+#ifndef MENUQC
+MODEL(HealthSmall_ITEM, Item_Model("g_h1.md3"));
+SOUND(HealthSmall, "misc/minihealth");
+#endif
+
+REGISTER_ITEM(HealthSmall, Health) {
+#ifndef MENUQC
+    this.m_model                =   MDL_HealthSmall_ITEM;
+    this.m_sound                =   SND_HealthSmall;
+#endif
+    this.m_name                 =   "5 Health";
+    this.m_icon                 =   "health";
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
+    this.m_itemid               =   IT_5HP;
+    this.m_respawntime          =   GET(g_pickup_respawntime_short);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
+#endif
+}
+
+#ifndef MENUQC
+MODEL(HealthMedium_ITEM, Item_Model("g_h25.md3"));
+SOUND(HealthMedium, "misc/mediumhealth");
+#endif
+
+REGISTER_ITEM(HealthMedium, Health) {
+#ifndef MENUQC
+    this.m_model                =   MDL_HealthMedium_ITEM;
+    this.m_sound                =   SND_HealthMedium;
+#endif
+    this.m_name                 =   "25 Health";
+    this.m_icon                 =   "health";
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_MID;
+    this.m_itemid               =   IT_25HP;
+    this.m_respawntime          =   GET(g_pickup_respawntime_short);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
+#endif
+}
+
+#ifndef MENUQC
+MODEL(HealthLarge_ITEM, Item_Model("g_h50.md3"));
+SOUND(HealthLarge, "misc/mediumhealth");
+#endif
+
+REGISTER_ITEM(HealthLarge, Health) {
+#ifndef MENUQC
+    this.m_model                =   MDL_HealthLarge_ITEM;
+    this.m_sound                =   SND_HealthLarge;
+#endif
+    this.m_name                 =   "50 Health";
+    this.m_icon                 =   "health";
+    this.m_color                =   '1 0 0';
+    this.m_waypoint             =   _("Large health");
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_MID;
+    this.m_itemid               =   IT_25HP;
+    this.m_respawntime          =   GET(g_pickup_respawntime_medium);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
+#endif
+}
+
+#ifndef MENUQC
+MODEL(HealthMega_ITEM, Item_Model("g_h100.md3"));
+SOUND(HealthMega, "misc/megahealth");
+#endif
+
+REGISTER_ITEM(HealthMega, Health) {
+#ifndef MENUQC
+    this.m_model                =   MDL_HealthMega_ITEM;
+    this.m_sound                =   SND_HealthMega;
+#endif
+    this.m_name                 =   "100 Health";
+    this.m_icon                 =   "item_mega_health";
+    this.m_color                =   '1 0 0';
+    this.m_waypoint             =   _("Mega health");
+    this.m_waypointblink        =   2;
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
+    this.m_itemid               =   IT_HEALTH;
+    this.m_respawntime          =   GET(g_pickup_respawntime_long);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
+#endif
+}
index 7fd29e2..ec09d5c 100644 (file)
@@ -1,66 +1 @@
-#ifdef SVQC
-    #include <common/t_items.qh>
-#endif
-
-#include "ammo.qh"
-#include "powerup.qh"
-
-#ifndef SVQC
-.int m_itemid;
-#endif
-
-#ifndef MENUQC
-MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3"));
-#endif
-
-REGISTER_ITEM(Jetpack, Powerup) {
-#ifndef MENUQC
-    this.m_model                =   MDL_Jetpack_ITEM;
-    this.m_itemid               =   IT_JETPACK;
-#endif
-    this.m_name                 =   "Jet pack";
-    this.m_icon                 =   "jetpack";
-    this.m_color                =   '0.5 0.5 0.5';
-    this.m_waypoint             =   _("Jet Pack");
-    this.m_waypointblink        =   2;
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
-    this.m_pickupevalfunc       =   commodity_pickupevalfunc;
-#endif
-}
-
-#ifndef MENUQC
-MODEL(JetpackFuel_ITEM, Item_Model("g_fuel.md3"));
-#endif
-
-REGISTER_ITEM(JetpackFuel, Ammo) {
-#ifndef MENUQC
-    this.m_model    =   MDL_JetpackFuel_ITEM;
-#endif
-    this.m_name     =   "Fuel";
-    this.m_icon     =   "ammo_fuel";
-#ifdef SVQC
-    this.m_botvalue =   BOT_PICKUP_RATING_LOW;
-    this.m_itemid   =   IT_FUEL;
-#endif
-}
-
-#ifndef MENUQC
-MODEL(JetpackRegen_ITEM, Item_Model("g_fuelregen.md3"));
-#endif
-
-REGISTER_ITEM(JetpackRegen, Powerup) {
-#ifndef MENUQC
-    this.m_model                =   MDL_JetpackRegen_ITEM;
-#endif
-    this.m_name                 =   "Fuel regenerator";
-    this.m_icon                 =   "fuelregen";
-    this.m_color                =   '1 0.5 0';
-    this.m_waypoint             =   _("Fuel regen");
-    this.m_waypointblink        =   2;
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
-    this.m_itemid               =   IT_FUEL_REGEN;
-    this.m_pickupevalfunc       =   commodity_pickupevalfunc;
-#endif
-}
+#include "jetpack.qh"
index 6f70f09..67f308c 100644 (file)
@@ -1 +1,68 @@
 #pragma once
+
+#ifdef SVQC
+    #include <common/t_items.qh>
+#endif
+
+#include "ammo.qh"
+#include "powerup.qh"
+
+#ifndef SVQC
+.int m_itemid;
+#endif
+
+#ifndef MENUQC
+MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3"));
+#endif
+
+REGISTER_ITEM(Jetpack, Powerup) {
+#ifndef MENUQC
+    this.m_model                =   MDL_Jetpack_ITEM;
+    this.m_itemid               =   IT_JETPACK;
+#endif
+    this.m_name                 =   "Jet pack";
+    this.m_icon                 =   "jetpack";
+    this.m_color                =   '0.5 0.5 0.5';
+    this.m_waypoint             =   _("Jet Pack");
+    this.m_waypointblink        =   2;
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
+    this.m_pickupevalfunc       =   commodity_pickupevalfunc;
+#endif
+}
+
+#ifndef MENUQC
+MODEL(JetpackFuel_ITEM, Item_Model("g_fuel.md3"));
+#endif
+
+REGISTER_ITEM(JetpackFuel, Ammo) {
+#ifndef MENUQC
+    this.m_model    =   MDL_JetpackFuel_ITEM;
+#endif
+    this.m_name     =   "Fuel";
+    this.m_icon     =   "ammo_fuel";
+#ifdef SVQC
+    this.m_botvalue =   BOT_PICKUP_RATING_LOW;
+    this.m_itemid   =   IT_FUEL;
+#endif
+}
+
+#ifndef MENUQC
+MODEL(JetpackRegen_ITEM, Item_Model("g_fuelregen.md3"));
+#endif
+
+REGISTER_ITEM(JetpackRegen, Powerup) {
+#ifndef MENUQC
+    this.m_model                =   MDL_JetpackRegen_ITEM;
+#endif
+    this.m_name                 =   "Fuel regenerator";
+    this.m_icon                 =   "fuelregen";
+    this.m_color                =   '1 0.5 0';
+    this.m_waypoint             =   _("Fuel regen");
+    this.m_waypointblink        =   2;
+#ifdef SVQC
+    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
+    this.m_itemid               =   IT_FUEL_REGEN;
+    this.m_pickupevalfunc       =   commodity_pickupevalfunc;
+#endif
+}
index 136c8da..5bd5da7 100644 (file)
@@ -1,7 +1,31 @@
 #pragma once
 
+#ifdef SVQC
+PROPERTY(float, g_pickup_respawntime_weapon)
+PROPERTY(float, g_pickup_respawntime_superweapon)
+PROPERTY(float, g_pickup_respawntime_ammo)
+PROPERTY(float, g_pickup_respawntime_short)
+PROPERTY(float, g_pickup_respawntime_medium)
+PROPERTY(float, g_pickup_respawntime_long)
+PROPERTY(float, g_pickup_respawntime_powerup)
+PROPERTY(float, g_pickup_respawntimejitter_weapon)
+PROPERTY(float, g_pickup_respawntimejitter_superweapon)
+PROPERTY(float, g_pickup_respawntimejitter_ammo)
+PROPERTY(float, g_pickup_respawntimejitter_short)
+PROPERTY(float, g_pickup_respawntimejitter_medium)
+PROPERTY(float, g_pickup_respawntimejitter_long)
+PROPERTY(float, g_pickup_respawntimejitter_powerup)
+#endif
+
+// pickup ratings for bot logic
+const int BOT_PICKUP_RATING_LOW  =  2500;
+const int BOT_PICKUP_RATING_MID  =  5000;
+const int BOT_PICKUP_RATING_HIGH = 10000;
+
 #include <common/items/inventory.qh>
 #include <common/items/item.qh>
+#include <common/t_items.qh>
+
 CLASS(Pickup, GameItem)
 #ifndef MENUQC
     ATTRIB(Pickup, m_model, Model);
@@ -13,12 +37,12 @@ CLASS(Pickup, GameItem)
         TC(Pickup, this);
         LOG_INFOF("%s: %s\n", etos(this), this.m_name);
     }
+    ATTRIB(Pickup, m_itemid, int, 0);
 #ifdef SVQC
     ATTRIB(Pickup, m_mins, vector, '-16 -16 0');
     ATTRIB(Pickup, m_maxs, vector, '16 16 32');
     ATTRIB(Pickup, m_botvalue, int, 0);
     ATTRIB(Pickup, m_itemflags, int, 0);
-    ATTRIB(Pickup, m_itemid, int, 0);
     float generic_pickupevalfunc(entity player, entity item);
     ATTRIB(Pickup, m_pickupevalfunc, float(entity player, entity item), generic_pickupevalfunc);
     ATTRIB(Pickup, m_respawntime, float());
index 375f958..7c7405b 100644 (file)
@@ -1,37 +1 @@
 #include "powerup.qh"
-
-#ifndef MENUQC
-MODEL(Strength_ITEM, Item_Model("g_strength.md3"));
-SOUND(Strength, "misc/powerup");
-#endif
-
-REGISTER_ITEM(Strength, Powerup) {
-#ifndef MENUQC
-    this.m_model            =   MDL_Strength_ITEM;
-    this.m_sound            =   SND_Strength;
-#endif
-    this.m_name             =   "Strength Powerup";
-    this.m_icon             =   "strength";
-    this.m_color            =   '0 0 1';
-    this.m_waypoint         =   _("Strength");
-    this.m_waypointblink    =   2;
-    this.m_itemid           =   IT_STRENGTH;
-}
-
-#ifndef MENUQC
-MODEL(Shield_ITEM, Item_Model("g_invincible.md3"));
-SOUND(Shield, "misc/powerup_shield");
-#endif
-
-REGISTER_ITEM(Shield, Powerup) {
-#ifndef MENUQC
-    this.m_model            =   MDL_Shield_ITEM;
-    this.m_sound            =   SND_Shield;
-#endif
-    this.m_name             =   "Shield";
-    this.m_icon             =   "shield";
-    this.m_color            =   '1 0 1';
-    this.m_waypoint         =   _("Shield");
-    this.m_waypointblink    =   2;
-    this.m_itemid           =   IT_INVINCIBLE;
-}
index ca17c97..f0745b6 100644 (file)
@@ -16,3 +16,39 @@ CLASS(Powerup, Pickup)
     ATTRIB(Powerup, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_powerup));
 #endif
 ENDCLASS(Powerup)
+
+#ifndef MENUQC
+MODEL(Strength_ITEM, Item_Model("g_strength.md3"));
+SOUND(Strength, "misc/powerup");
+#endif
+
+REGISTER_ITEM(Strength, Powerup) {
+#ifndef MENUQC
+    this.m_model            =   MDL_Strength_ITEM;
+    this.m_sound            =   SND_Strength;
+#endif
+    this.m_name             =   "Strength Powerup";
+    this.m_icon             =   "strength";
+    this.m_color            =   '0 0 1';
+    this.m_waypoint         =   _("Strength");
+    this.m_waypointblink    =   2;
+    this.m_itemid           =   IT_STRENGTH;
+}
+
+#ifndef MENUQC
+MODEL(Shield_ITEM, Item_Model("g_invincible.md3"));
+SOUND(Shield, "misc/powerup_shield");
+#endif
+
+REGISTER_ITEM(Shield, Powerup) {
+#ifndef MENUQC
+    this.m_model            =   MDL_Shield_ITEM;
+    this.m_sound            =   SND_Shield;
+#endif
+    this.m_name             =   "Shield";
+    this.m_icon             =   "shield";
+    this.m_color            =   '1 0 1';
+    this.m_waypoint         =   _("Shield");
+    this.m_waypointblink    =   2;
+    this.m_itemid           =   IT_INVINCIBLE;
+}
index 2bc84c4..9ef75a6 100644 (file)
@@ -1,7 +1,7 @@
 #if defined(CSQC)
     #include "../client/defs.qh"
     #include "util.qh"
-    #include <common/weapons/all.qh>
+    #include <common/weapons/_all.qh>
     #include "mapinfo.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
index 66693ef..4171f47 100644 (file)
@@ -9,3 +9,5 @@
 #ifdef SVQC
     #include <common/minigames/sv_minigames.qc>
 #endif
+
+#include <common/minigames/minigame/_mod.inc>
index 9c33760..e0daf8f 100644 (file)
@@ -9,3 +9,5 @@
 #ifdef SVQC
     #include <common/minigames/sv_minigames.qh>
 #endif
+
+#include <common/minigames/minigame/_mod.qh>
diff --git a/qcsrc/common/monsters/_all.inc b/qcsrc/common/monsters/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"
diff --git a/qcsrc/common/monsters/_all.qh b/qcsrc/common/monsters/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"
index 3abacac..fa3f651 100644 (file)
@@ -15,7 +15,7 @@ string M_Model(string m_mdl)
 #include "all.qh"
 
 #define IMPLEMENTATION
-#include "monster/_all.inc"
+#include "monster/_mod.inc"
 #undef IMPLEMENTATION
 
 #ifdef SVQC
index d49489f..84f7a0d 100644 (file)
@@ -16,4 +16,4 @@ const int MON_FIRST = 1;
 REGISTER_MONSTER(Null, NEW(Monster));
 
 
-#include "monster/_all.inc"
+#include "monster/_mod.inc"
diff --git a/qcsrc/common/monsters/monster/_all.inc b/qcsrc/common/monsters/monster/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/common/monsters/monster/_all.qh b/qcsrc/common/monsters/monster/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 509fa0a..e23f77a 100644 (file)
@@ -22,8 +22,8 @@ REGISTER_MONSTER(MAGE, NEW(Mage)) {
 #endif
 }
 
-#include <common/weapons/all.qh>
-#include <common/items/all.qc>
+#include <common/weapons/_all.qh>
+#include <common/items/_mod.qh>
 
 CLASS(MageSpike, PortoLaunch)
 /* flags     */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
index 9fa7350..ad7fb9f 100644 (file)
@@ -22,7 +22,7 @@ REGISTER_MONSTER(SPIDER, NEW(Spider)) {
 #endif
 }
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 CLASS(SpiderAttack, PortoLaunch)
 /* flags     */ ATTRIB(SpiderAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
index 33a3c44..eab1413 100644 (file)
@@ -22,7 +22,7 @@ REGISTER_MONSTER(WYVERN, NEW(Wyvern)) {
 #endif
 }
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 CLASS(WyvernAttack, PortoLaunch)
 /* flags     */ ATTRIB(WyvernAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
index beca5eb..9a45e85 100644 (file)
@@ -1,28 +1,27 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include <lib/warpzone/common.qh>
-    #include "../constants.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "all.qh"
-    #include "sv_monsters.qh"
-       #include "../physics/movelib.qh"
-    #include "../weapons/all.qh"
-    #include <server/autocvars.qh>
-    #include <server/defs.qh>
-    #include "../deathtypes/all.qh"
-    #include <server/mutators/_all.qh>
-       #include <server/steerlib.qh>
-       #include "../turrets/sv_turrets.qh"
-       #include "../turrets/util.qh"
-    #include "../vehicles/all.qh"
-    #include <server/campaign.qh>
-    #include <server/command/_all.qh>
-       #include "../triggers/triggers.qh"
-    #include <lib/csqcmodel/sv_model.qh>
-    #include <server/round_handler.qh>
-#endif
+#include "sv_monsters.qh"
+
+#include <server/g_subs.qh>
+#include <lib/warpzone/common.qh>
+#include "../constants.qh"
+#include "../teams.qh"
+#include "../util.qh"
+#include "all.qh"
+#include "../physics/movelib.qh"
+#include "../weapons/_mod.qh"
+#include <server/autocvars.qh>
+#include <server/defs.qh>
+#include "../deathtypes/all.qh"
+#include <server/mutators/_mod.qh>
+#include <server/steerlib.qh>
+#include "../turrets/sv_turrets.qh"
+#include "../turrets/util.qh"
+#include "../vehicles/all.qh"
+#include <server/campaign.qh>
+#include <server/command/_mod.qh>
+#include "../triggers/triggers.qh"
+#include <lib/csqcmodel/sv_model.qh>
+#include <server/round_handler.qh>
+#include <server/weapons/_mod.qh>
 
 void monsters_setstatus(entity this)
 {
@@ -507,6 +506,8 @@ bool Monster_Respawn_Check(entity this)
 
 void Monster_Respawn(entity this) { Monster_Spawn(this, this.monsterid); }
 
+.vector        pos1, pos2;
+
 void Monster_Dead_Fade(entity this)
 {
        if(Monster_Respawn_Check(this))
@@ -542,6 +543,7 @@ void Monster_Use(entity this, entity actor, entity trigger)
        if(Monster_ValidTarget(this, actor)) { this.enemy = actor; }
 }
 
+.float pass_distance;
 vector Monster_Move_Target(entity this, entity targ)
 {
        // enemy is always preferred target
@@ -685,6 +687,7 @@ void Monster_CalculateVelocity(entity this, vector to, vector from, float turnra
 }
 
 .entity draggedby;
+.entity target2;
 
 void Monster_Move(entity this, float runspeed, float walkspeed, float stpspeed)
 {
diff --git a/qcsrc/common/mutators/_all.inc b/qcsrc/common/mutators/_all.inc
deleted file mode 100644 (file)
index 65d7092..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
-
-#include "mutator/_all.inc"
diff --git a/qcsrc/common/mutators/_all.qh b/qcsrc/common/mutators/_all.qh
deleted file mode 100644 (file)
index bae58a5..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include "mutator/_all.qh"
index 98fb481..29d6dea 100644 (file)
@@ -1 +1,3 @@
 // generated file; do not modify
+
+#include <common/mutators/mutator/_mod.inc>
index 98fb481..b19e9c4 100644 (file)
@@ -1 +1,3 @@
 // generated file; do not modify
+
+#include <common/mutators/mutator/_mod.qh>
diff --git a/qcsrc/common/mutators/mutator/_all.inc b/qcsrc/common/mutators/mutator/_all.inc
deleted file mode 100644 (file)
index 9b557a2..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
-
-#include "waypoints/_mod.inc"
-
-#include "itemstime/_mod.inc"
-#include "multijump/_mod.inc"
-#include "nades/_mod.inc"
-#include "superspec/_mod.inc"
-
-// completely self contained
-
-#include "bloodloss/_mod.inc"
-#include "breakablehook/_mod.inc"
-#include "buffs/_mod.inc"
-#include "bugrigs/_mod.inc"
-#include "campcheck/_mod.inc"
-#include "cloaked/_mod.inc"
-#include "damagetext/_mod.inc"
-#include "dodging/_mod.inc"
-#include "doublejump/_mod.inc"
-#include "globalforces/_mod.inc"
-#include "hook/_mod.inc"
-#include "instagib/_mod.inc"
-#include "invincibleproj/_mod.inc"
-#include "melee_only/_mod.inc"
-#include "midair/_mod.inc"
-#include "new_toys/_mod.inc"
-#include "nix/_mod.inc"
-#include "overkill/_mod.inc"
-#include "physical_items/_mod.inc"
-#include "pinata/_mod.inc"
-#include "random_gravity/_mod.inc"
-#include "rocketflying/_mod.inc"
-#include "rocketminsta/_mod.inc"
-#include "running_guns/_mod.inc"
-#include "sandbox/_mod.inc"
-#include "spawn_near_teammate/_mod.inc"
-#include "touchexplode/_mod.inc"
-#include "vampirehook/_mod.inc"
-#include "vampire/_mod.inc"
-#include "weaponarena_random/_mod.inc"
-
diff --git a/qcsrc/common/mutators/mutator/_all.qh b/qcsrc/common/mutators/mutator/_all.qh
deleted file mode 100644 (file)
index b49167e..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include "waypoints/_mod.qh"
-
-#include "itemstime/_mod.qh"
-#include "multijump/_mod.qh"
-#include "nades/_mod.qh"
-#include "superspec/_mod.qh"
-
-// completely self contained
-
-#include "bloodloss/_mod.qh"
-#include "breakablehook/_mod.qh"
-#include "buffs/_mod.qh"
-#include "bugrigs/_mod.qh"
-#include "campcheck/_mod.qh"
-#include "cloaked/_mod.qh"
-#include "damagetext/_mod.qh"
-#include "dodging/_mod.qh"
-#include "doublejump/_mod.qh"
-#include "globalforces/_mod.qh"
-#include "hook/_mod.qh"
-#include "instagib/_mod.qh"
-#include "invincibleproj/_mod.qh"
-#include "melee_only/_mod.qh"
-#include "midair/_mod.qh"
-#include "new_toys/_mod.qh"
-#include "nix/_mod.qh"
-#include "overkill/_mod.qh"
-#include "physical_items/_mod.qh"
-#include "pinata/_mod.qh"
-#include "random_gravity/_mod.qh"
-#include "rocketflying/_mod.qh"
-#include "rocketminsta/_mod.qh"
-#include "running_guns/_mod.qh"
-#include "sandbox/_mod.qh"
-#include "spawn_near_teammate/_mod.qh"
-#include "touchexplode/_mod.qh"
-#include "vampirehook/_mod.qh"
-#include "vampire/_mod.qh"
-#include "weaponarena_random/_mod.qh"
-
index 98fb481..294047d 100644 (file)
@@ -1 +1,37 @@
 // generated file; do not modify
+
+#include <common/mutators/mutator/bloodloss/_mod.inc>
+#include <common/mutators/mutator/breakablehook/_mod.inc>
+#include <common/mutators/mutator/buffs/_mod.inc>
+#include <common/mutators/mutator/bugrigs/_mod.inc>
+#include <common/mutators/mutator/campcheck/_mod.inc>
+#include <common/mutators/mutator/cloaked/_mod.inc>
+#include <common/mutators/mutator/damagetext/_mod.inc>
+#include <common/mutators/mutator/dodging/_mod.inc>
+#include <common/mutators/mutator/doublejump/_mod.inc>
+#include <common/mutators/mutator/globalforces/_mod.inc>
+#include <common/mutators/mutator/hook/_mod.inc>
+#include <common/mutators/mutator/instagib/_mod.inc>
+#include <common/mutators/mutator/invincibleproj/_mod.inc>
+#include <common/mutators/mutator/itemstime/_mod.inc>
+#include <common/mutators/mutator/melee_only/_mod.inc>
+#include <common/mutators/mutator/midair/_mod.inc>
+#include <common/mutators/mutator/multijump/_mod.inc>
+#include <common/mutators/mutator/nades/_mod.inc>
+#include <common/mutators/mutator/new_toys/_mod.inc>
+#include <common/mutators/mutator/nix/_mod.inc>
+#include <common/mutators/mutator/overkill/_mod.inc>
+#include <common/mutators/mutator/physical_items/_mod.inc>
+#include <common/mutators/mutator/pinata/_mod.inc>
+#include <common/mutators/mutator/random_gravity/_mod.inc>
+#include <common/mutators/mutator/rocketflying/_mod.inc>
+#include <common/mutators/mutator/rocketminsta/_mod.inc>
+#include <common/mutators/mutator/running_guns/_mod.inc>
+#include <common/mutators/mutator/sandbox/_mod.inc>
+#include <common/mutators/mutator/spawn_near_teammate/_mod.inc>
+#include <common/mutators/mutator/superspec/_mod.inc>
+#include <common/mutators/mutator/touchexplode/_mod.inc>
+#include <common/mutators/mutator/vampire/_mod.inc>
+#include <common/mutators/mutator/vampirehook/_mod.inc>
+#include <common/mutators/mutator/waypoints/_mod.inc>
+#include <common/mutators/mutator/weaponarena_random/_mod.inc>
index 98fb481..de43630 100644 (file)
@@ -1 +1,37 @@
 // generated file; do not modify
+
+#include <common/mutators/mutator/bloodloss/_mod.qh>
+#include <common/mutators/mutator/breakablehook/_mod.qh>
+#include <common/mutators/mutator/buffs/_mod.qh>
+#include <common/mutators/mutator/bugrigs/_mod.qh>
+#include <common/mutators/mutator/campcheck/_mod.qh>
+#include <common/mutators/mutator/cloaked/_mod.qh>
+#include <common/mutators/mutator/damagetext/_mod.qh>
+#include <common/mutators/mutator/dodging/_mod.qh>
+#include <common/mutators/mutator/doublejump/_mod.qh>
+#include <common/mutators/mutator/globalforces/_mod.qh>
+#include <common/mutators/mutator/hook/_mod.qh>
+#include <common/mutators/mutator/instagib/_mod.qh>
+#include <common/mutators/mutator/invincibleproj/_mod.qh>
+#include <common/mutators/mutator/itemstime/_mod.qh>
+#include <common/mutators/mutator/melee_only/_mod.qh>
+#include <common/mutators/mutator/midair/_mod.qh>
+#include <common/mutators/mutator/multijump/_mod.qh>
+#include <common/mutators/mutator/nades/_mod.qh>
+#include <common/mutators/mutator/new_toys/_mod.qh>
+#include <common/mutators/mutator/nix/_mod.qh>
+#include <common/mutators/mutator/overkill/_mod.qh>
+#include <common/mutators/mutator/physical_items/_mod.qh>
+#include <common/mutators/mutator/pinata/_mod.qh>
+#include <common/mutators/mutator/random_gravity/_mod.qh>
+#include <common/mutators/mutator/rocketflying/_mod.qh>
+#include <common/mutators/mutator/rocketminsta/_mod.qh>
+#include <common/mutators/mutator/running_guns/_mod.qh>
+#include <common/mutators/mutator/sandbox/_mod.qh>
+#include <common/mutators/mutator/spawn_near_teammate/_mod.qh>
+#include <common/mutators/mutator/superspec/_mod.qh>
+#include <common/mutators/mutator/touchexplode/_mod.qh>
+#include <common/mutators/mutator/vampire/_mod.qh>
+#include <common/mutators/mutator/vampirehook/_mod.qh>
+#include <common/mutators/mutator/waypoints/_mod.qh>
+#include <common/mutators/mutator/weaponarena_random/_mod.qh>
index 89c550f..2b4291f 100644 (file)
@@ -3,8 +3,10 @@
 #include <common/teams.qh>
 #include <common/util.qh>
 
+#ifndef MENUQC
 REGISTER_WAYPOINT(Buff, _("Buff"), '1 0.5 0', 1);
 REGISTER_RADARICON(Buff, 1);
+#endif
 
 REGISTRY(Buffs, BITS(5))
 #define Buffs_from(i) _Buffs_from(i, BUFF_Null)
index 0ea6b05..d9223b3 100644 (file)
@@ -1,7 +1,7 @@
 #include "sv_buffs.qh"
 
 #include <common/triggers/target/music.qh>
-#include <common/gamemodes/_all.qh>
+#include <common/gamemodes/_mod.qh>
 
 .float buff_time = _STAT(BUFF_TIME);
 void buffs_DelayedInit(entity this);
index 269ec2d..65decbf 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/items/all.qh>
+#include <common/items/_mod.qh>
 #include <common/items/item/ammo.qh>
 #include <common/items/item/powerup.qh>
 
index 6176ebb..0cf3ed9 100644 (file)
@@ -6,7 +6,7 @@ float autocvar_g_instagib_speed_highspeed;
 
 #include <server/client.qh>
 
-#include <common/items/all.qc>
+#include <common/items/_mod.qh>
 
 REGISTER_MUTATOR(mutator_instagib, cvar("g_instagib") && !g_nexball);
 
index b8d1007..d907864 100644 (file)
@@ -145,7 +145,7 @@ void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expan
 
 #ifdef SVQC
 
-#include <common/gamemodes/_all.qh>
+#include <common/gamemodes/_mod.qh>
 #include <common/monsters/spawn.qh>
 #include <common/monsters/sv_monsters.qh>
 #include <server/g_subs.qh>
index 6d5ac80..ea7ed95 100644 (file)
@@ -1,5 +1,8 @@
 #include "sv_overkill.qh"
 
+#include "hmg.qh"
+#include "rpc.qh"
+
 bool autocvar_g_overkill_powerups_replace;
 float autocvar_g_overkill_superguns_respawn_time;
 bool autocvar_g_overkill_100h_anyway;
index 26e4058..6a420b7 100644 (file)
@@ -1,5 +1,4 @@
-#ifndef WAYPOINTSPRITES_H
-#define WAYPOINTSPRITES_H
+#pragma once
 
 #include "all.qh"
 
@@ -118,6 +117,8 @@ void Draw_WaypointSprite(entity this);
 #endif
 
 #ifdef SVQC
+.entity sprite;
+
 float autocvar_sv_waypointsprite_deadlifetime;
 float autocvar_sv_waypointsprite_deployed_lifetime;
 float autocvar_sv_waypointsprite_limitedrange;
@@ -234,5 +235,3 @@ void WaypointSprite_PlayerDead(entity this);
 
 void WaypointSprite_PlayerGone(entity this);
 #endif
-
-#endif
index 49d2c57..5d8e934 100644 (file)
@@ -8,7 +8,7 @@
        #include <server/constants.qh>
        #include <server/defs.qh>
        #include "all.qh"
-       #include <server/mutators/_all.qh>
+       #include <server/mutators/_mod.qh>
 #endif
 
 // ================================================
index e66ea3f..1fd7f10 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 
 #include <common/constants.qh>
 #include <common/teams.qh>
index 3a61cd4..100aeca 100644 (file)
@@ -1,3 +1,5 @@
 // generated file; do not modify
 #include <common/physics/movelib.qc>
 #include <common/physics/player.qc>
+
+#include <common/physics/movetypes/_mod.inc>
index 39dacad..377a7b3 100644 (file)
@@ -1,3 +1,5 @@
 // generated file; do not modify
 #include <common/physics/movelib.qh>
 #include <common/physics/player.qh>
+
+#include <common/physics/movetypes/_mod.qh>
index ad58221..56ffcce 100644 (file)
@@ -3,7 +3,7 @@
 #elif defined(SVQC)
     #include "constants.qh"
     #include "util.qh"
-    #include <common/weapons/all.qh>
+    #include <common/weapons/_all.qh>
     #include "../server/weapons/accuracy.qh"
     #include "../server/defs.qh"
     #include "playerstats.qh"
index 32e718a..ebc9711 100644 (file)
@@ -1,12 +1,12 @@
 #include "t_items.qh"
 
-#include "items/all.qc"
+#include "items/_mod.qh"
 
 #if defined(SVQC)
 
     #include "../server/bot/api.qh"
 
-    #include <server/mutators/_all.qh>
+    #include <server/mutators/_mod.qh>
 
     #include "../server/weapons/common.qh"
     #include "../server/weapons/selection.qh"
 
     #include <common/monsters/all.qh>
 
-    #include <common/weapons/all.qh>
+    #include <common/weapons/_all.qh>
 
     #include "../lib/warpzone/util_server.qh"
 #elif defined(CSQC)
        #include "physics/movetypes/movetypes.qh"
-       #include <common/weapons/all.qh>
+       #include <common/weapons/_all.qh>
        #include "../lib/csqcmodel/cl_model.qh"
        #include "../lib/csqcmodel/common.qh"
 #endif
index c049b10..9b327de 100644 (file)
@@ -4,3 +4,8 @@
 #include <common/triggers/subs.qc>
 #include <common/triggers/teleporters.qc>
 #include <common/triggers/triggers.qc>
+
+#include <common/triggers/func/_mod.inc>
+#include <common/triggers/misc/_mod.inc>
+#include <common/triggers/target/_mod.inc>
+#include <common/triggers/trigger/_mod.inc>
index 2fba604..d3bb2dc 100644 (file)
@@ -4,3 +4,8 @@
 #include <common/triggers/subs.qh>
 #include <common/triggers/teleporters.qh>
 #include <common/triggers/triggers.qh>
+
+#include <common/triggers/func/_mod.qh>
+#include <common/triggers/misc/_mod.qh>
+#include <common/triggers/target/_mod.qh>
+#include <common/triggers/trigger/_mod.qh>
index 99eb846..e204d3a 100644 (file)
@@ -2,7 +2,7 @@
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include <lib/warpzone/util_server.qh>
-    #include <common/weapons/all.qh>
+    #include <common/weapons/_all.qh>
     #include <server/defs.qh>
     #include <common/deathtypes/all.qh>
 #endif
diff --git a/qcsrc/common/turrets/_all.inc b/qcsrc/common/turrets/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"
diff --git a/qcsrc/common/turrets/_all.qh b/qcsrc/common/turrets/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"
index ec62c24..469a64c 100644 (file)
@@ -7,7 +7,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_TURRET)
 #endif
 
 #define IMPLEMENTATION
-#include "turret/_all.inc"
+#include "turret/_mod.inc"
 #undef IMPLEMENTATION
 
 #ifdef CSQC
index cbb0379..1a77e98 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include "config.qh"
 
 #include "turret.qh"
@@ -73,4 +73,4 @@ const int TUR_FIRST = 1;
 
 REGISTER_TURRET(Null, NEW(Turret));
 
-#include "turret/_all.inc"
+#include "turret/_mod.inc"
index 649fd51..8e52397 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 CLASS(Turret, Object)
     ATTRIB(Turret, m_id, int, 0);
diff --git a/qcsrc/common/turrets/turret/_all.inc b/qcsrc/common/turrets/turret/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/common/turrets/turret/_all.qh b/qcsrc/common/turrets/turret/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
diff --git a/qcsrc/common/vehicles/_all.inc b/qcsrc/common/vehicles/_all.inc
new file mode 100644 (file)
index 0000000..8bc63f7
--- /dev/null
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "_mod.inc"
diff --git a/qcsrc/common/vehicles/_all.qh b/qcsrc/common/vehicles/_all.qh
new file mode 100644 (file)
index 0000000..947026d
--- /dev/null
@@ -0,0 +1,2 @@
+#pragma once
+#include "_mod.qh"
index 5a14b64..251df22 100644 (file)
@@ -12,7 +12,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR)
 #endif
 
 #define IMPLEMENTATION
-#include "vehicle/_all.inc"
+#include "vehicle/_mod.inc"
 #undef IMPLEMENTATION
 
 #endif
index 779076a..158492f 100644 (file)
@@ -20,4 +20,4 @@ const int VEH_FIRST = 1;
 
 REGISTER_VEHICLE(Null, NEW(Vehicle));
 
-#include "vehicle/_all.inc"
+#include "vehicle/_mod.inc"
diff --git a/qcsrc/common/vehicles/vehicle/_all.inc b/qcsrc/common/vehicles/vehicle/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/common/vehicles/vehicle/_all.qh b/qcsrc/common/vehicles/vehicle/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 73fed55..d4ed950 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 float autocvar_g_vehicle_bumblebee_cannon_cost = 2;
 float autocvar_g_vehicle_bumblebee_cannon_damage = 60;
index fc9e352..51c20ef 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 CLASS(RacerAttack, PortoLaunch)
 /* flags     */ ATTRIB(RacerAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
index 0b3af41..4260d42 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 CLASS(RaptorCannon, PortoLaunch)
 /* flags     */ ATTRIB(RaptorCannon, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
index 61e2b02..a152304 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 #ifdef SVQC
 void spiderbot_rocket_do(entity this);
diff --git a/qcsrc/common/weapons/_all.inc b/qcsrc/common/weapons/_all.inc
new file mode 100644 (file)
index 0000000..213c39c
--- /dev/null
@@ -0,0 +1,2 @@
+#include "_all.qh"
+#include "all.qc"
diff --git a/qcsrc/common/weapons/_all.qh b/qcsrc/common/weapons/_all.qh
new file mode 100644 (file)
index 0000000..671dde0
--- /dev/null
@@ -0,0 +1,2 @@
+#pragma once
+#include "all.qh"
index 81790e6..6547507 100644 (file)
@@ -19,6 +19,7 @@
        #include <lib/csqcmodel/cl_model.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
+       #include <common/items/_mod.qh>
     #include <lib/warpzone/anglestransform.qh>
     #include <lib/warpzone/common.qh>
     #include <lib/warpzone/util_server.qh>
@@ -37,9 +38,9 @@
     #include <server/defs.qh>
     #include "../notifications/all.qh"
     #include "../deathtypes/all.qh"
-    #include <server/mutators/_all.qh>
+    #include <server/mutators/_mod.qh>
     #include "../mapinfo.qh"
-    #include <server/command/_all.qh>
+    #include <server/command/_mod.qh>
     #include <lib/csqcmodel/sv_model.qh>
     #include <server/portals.qh>
     #include <server/g_hook.qh>
index 113ae83..28fbd9c 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include <common/stats.qh>
 #include "config.qh"
 
index 73d9b93..c35b193 100644 (file)
@@ -1,3 +1,5 @@
+#include "calculations.qh"
+
 // =============================
 //  Explosion Force Calculation
 // =============================
index 05eb9d9..c349eec 100644 (file)
@@ -3,3 +3,4 @@
 vector damage_explosion_calcpush(vector explosion_f, vector target_v, float speedfactor);
 vector W_CalculateSpread(vector forward, float spread, float spreadfactor, float spreadstyle);
 int W_GetGunAlignment(entity player);
+float explosion_calcpush_getmultiplier(vector explosion_v, vector target_v);
index a08be2e..c525bb8 100644 (file)
@@ -130,7 +130,7 @@ CLASS(Weapon, Object)
        }
 ENDCLASS(Weapon)
 
-#include <common/items/all.qh>
+#include <common/items/_mod.qh>
 CLASS(WeaponPickup, Pickup)
     ATTRIB(WeaponPickup, m_weapon, Weapon);
     ATTRIB(WeaponPickup, m_name, string);
@@ -175,11 +175,6 @@ ENDCLASS(OffhandWeapon)
 
 const int MAX_SHOT_DISTANCE = 32768;
 
-// weapon pickup ratings for bot logic
-const int BOT_PICKUP_RATING_LOW  =  2500;
-const int BOT_PICKUP_RATING_MID  =  5000;
-const int BOT_PICKUP_RATING_HIGH = 10000;
-
 // weapon flags
 const int WEP_TYPE_OTHER          =  0x00; // not for damaging people
 const int WEP_TYPE_SPLASH         =  0x01; // splash damage
diff --git a/qcsrc/ecs/_lib.inc b/qcsrc/ecs/_lib.inc
deleted file mode 100644 (file)
index 726f693..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "_lib.qh"
-
-#include "_mod.inc"
-#include "components/_mod.inc"
-#include "events/_mod.inc"
-#include "systems/_mod.inc"
diff --git a/qcsrc/ecs/_lib.qh b/qcsrc/ecs/_lib.qh
deleted file mode 100644 (file)
index a617c73..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-/** Components always interpolate from the previous state */
-#define COMPONENT(com) \
-       void com_##com##_interpolate(entity it, float a); \
-       .bool com_##com
-
-#define FOREACH_COMPONENT(com, body) FOREACH_ENTITY_FLOAT(com_##com, true, body)
-
-
-#define EVENT(T, args) .bool evt_##T##_listener; .void args evt_##T
-
-#define emit(T, ...) \
-       MACRO_BEGIN \
-       FOREACH_ENTITY_FLOAT_ORDERED(evt_##T##_listener, true, it.evt_##T(__VA_ARGS__)); \
-       MACRO_END
-
-#define subscribe(listener, T, fn) \
-       MACRO_BEGIN \
-       listener.evt_##T = (fn); \
-       listener.evt_##T##_listener = true; \
-       MACRO_END
-
-
-/**
- * framelimit 0 is no limit, interpolation does not apply
- * framerate below minfps will result in less than 100% speed
- */
-#define SYSTEM(sys, frameLimit, minfps) \
-       void sys_##sys##_update(entity this, float dt); \
-       float autocvar_xon_sys_##sys##_dt = ((frameLimit) ? (1 / (frameLimit)) : 0); \
-       float autocvar_xon_sys_##sys##_minfps = (1 / (1 / (minfps)))
-
-#define SYSTEM_UPDATE(sys) \
-       MACRO_BEGIN \
-       static float t = 0; \
-       float dt = autocvar_xon_sys_##sys##_dt; \
-       float minfps = autocvar_xon_sys_##sys##_minfps; \
-       static float accumulator = 0; \
-       float a = 0; \
-       if (dt) { \
-               accumulator += min(frametime, 1 / (minfps)); \
-       } else { \
-               accumulator += frametime; \
-               dt = accumulator; \
-               a = 1; \
-       } \
-       while (accumulator >= dt) \
-       { \
-               time = t; \
-               FOREACH_COMPONENT(sys, sys_##sys##_update(it, dt)); \
-               t += dt; \
-               accumulator -= dt; \
-       } \
-       if (!a) a = accumulator / dt; \
-       FOREACH_COMPONENT(sys, com_##sys##_interpolate(it, a)); \
-       MACRO_END
index 683c3a9..48b7069 100644 (file)
@@ -1,2 +1,6 @@
 // generated file; do not modify
 #include <ecs/main.qc>
+
+#include <ecs/components/_mod.inc>
+#include <ecs/events/_mod.inc>
+#include <ecs/systems/_mod.inc>
index 4d8bc34..0d1ff44 100644 (file)
@@ -1,2 +1,6 @@
 // generated file; do not modify
 #include <ecs/main.qh>
+
+#include <ecs/components/_mod.qh>
+#include <ecs/events/_mod.qh>
+#include <ecs/systems/_mod.qh>
diff --git a/qcsrc/ecs/lib.qh b/qcsrc/ecs/lib.qh
new file mode 100644 (file)
index 0000000..a617c73
--- /dev/null
@@ -0,0 +1,57 @@
+#pragma once
+
+/** Components always interpolate from the previous state */
+#define COMPONENT(com) \
+       void com_##com##_interpolate(entity it, float a); \
+       .bool com_##com
+
+#define FOREACH_COMPONENT(com, body) FOREACH_ENTITY_FLOAT(com_##com, true, body)
+
+
+#define EVENT(T, args) .bool evt_##T##_listener; .void args evt_##T
+
+#define emit(T, ...) \
+       MACRO_BEGIN \
+       FOREACH_ENTITY_FLOAT_ORDERED(evt_##T##_listener, true, it.evt_##T(__VA_ARGS__)); \
+       MACRO_END
+
+#define subscribe(listener, T, fn) \
+       MACRO_BEGIN \
+       listener.evt_##T = (fn); \
+       listener.evt_##T##_listener = true; \
+       MACRO_END
+
+
+/**
+ * framelimit 0 is no limit, interpolation does not apply
+ * framerate below minfps will result in less than 100% speed
+ */
+#define SYSTEM(sys, frameLimit, minfps) \
+       void sys_##sys##_update(entity this, float dt); \
+       float autocvar_xon_sys_##sys##_dt = ((frameLimit) ? (1 / (frameLimit)) : 0); \
+       float autocvar_xon_sys_##sys##_minfps = (1 / (1 / (minfps)))
+
+#define SYSTEM_UPDATE(sys) \
+       MACRO_BEGIN \
+       static float t = 0; \
+       float dt = autocvar_xon_sys_##sys##_dt; \
+       float minfps = autocvar_xon_sys_##sys##_minfps; \
+       static float accumulator = 0; \
+       float a = 0; \
+       if (dt) { \
+               accumulator += min(frametime, 1 / (minfps)); \
+       } else { \
+               accumulator += frametime; \
+               dt = accumulator; \
+               a = 1; \
+       } \
+       while (accumulator >= dt) \
+       { \
+               time = t; \
+               FOREACH_COMPONENT(sys, sys_##sys##_update(it, dt)); \
+               t += dt; \
+               accumulator -= dt; \
+       } \
+       if (!a) a = accumulator / dt; \
+       FOREACH_COMPONENT(sys, com_##sys##_interpolate(it, a)); \
+       MACRO_END
index 9b7bf35..724cb1e 100644 (file)
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "lib.qh"
+
 void systems_update();
index cdacdc6..a5204fa 100644 (file)
@@ -122,7 +122,7 @@ void    isnt_bool(float this) { print(ftos(this)); }
 #include "vector.qh"
 #include "yenc.qh"
 
-#include "matrix/_all.inc"
+#include "matrix/_mod.inc"
 
 #ifndef SVQC
 #define objerror_safe(e)
@@ -267,6 +267,5 @@ void make_safe_for_remove(entity this);
 #undef ENGINE_EVENT
 
 #ifndef MENUQC
-       #include <ecs/_lib.qh>
-       #include <ecs/components/_mod.qh>
+       #include <ecs/_mod.qh>
 #endif
diff --git a/qcsrc/lib/matrix/_all.inc b/qcsrc/lib/matrix/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/lib/matrix/_all.qh b/qcsrc/lib/matrix/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index cff5be7..90e3cd7 100644 (file)
@@ -4,7 +4,7 @@
     #include <common/t_items.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include <common/weapons/all.qh>
+    #include <common/weapons/_all.qh>
 #endif
 
 void WarpZone_Accumulator_Clear(entity acc)
index bff2197..34ea261 100644 (file)
@@ -7,7 +7,7 @@
        #include <common/constants.qh>
        #include <common/triggers/subs.qh>
        #include <common/util.qh>
-       #include <server/command/_all.qh>
+       #include <server/command/_mod.qh>
        #include <server/constants.qh>
        #include <server/defs.qh>
 #endif
index bebbdcc..e5198f5 100644 (file)
@@ -1,10 +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 "anim/_mod.inc"
+#include "command/_mod.inc"
+#include "item/_mod.inc"
+#include "mutators/_mod.inc"
+#include "xonotic/_mod.inc"
 
 #include <common/_all.inc>
diff --git a/qcsrc/menu/anim/_all.inc b/qcsrc/menu/anim/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/menu/anim/_all.qh b/qcsrc/menu/anim/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
diff --git a/qcsrc/menu/command/_all.inc b/qcsrc/menu/command/_all.inc
deleted file mode 100644 (file)
index 2e1b0ab..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
-
-#include <common/command/_all.inc>
diff --git a/qcsrc/menu/command/_all.qh b/qcsrc/menu/command/_all.qh
deleted file mode 100644 (file)
index 9b89bcd..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include <common/command/_all.qh>
index fb0ac17..72aadf6 100644 (file)
@@ -5,7 +5,7 @@
 
 #include "../mutators/events.qh"
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 
 .entity firstChild, nextSibling;
 
diff --git a/qcsrc/menu/item/_all.inc b/qcsrc/menu/item/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/menu/item/_all.qh b/qcsrc/menu/item/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 22934ca..aaa33b1 100644 (file)
@@ -17,8 +17,8 @@
 
 #include "xonotic/util.qh"
 
-#include "../common/items/all.qh"
-#include <common/weapons/all.qh>
+#include "../common/items/_mod.qh"
+#include <common/weapons/_all.qh>
 #include "../common/mapinfo.qh"
 #include "../common/mutators/base.qh"
 
diff --git a/qcsrc/menu/mutators/_all.inc b/qcsrc/menu/mutators/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/menu/mutators/_all.qh b/qcsrc/menu/mutators/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
diff --git a/qcsrc/menu/xonotic/_all.inc b/qcsrc/menu/xonotic/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/menu/xonotic/_all.qh b/qcsrc/menu/xonotic/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index f2f7f5c..07fe09c 100644 (file)
@@ -1,5 +1,5 @@
 #include "dialog_multiplayer_create_mutators.qh"
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 #include "weaponarenacheckbox.qh"
 #include "checkbox.qh"
index 27e4881..2d093a2 100644 (file)
@@ -1,6 +1,6 @@
 #include "keybinder.qh"
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 .int flags;
 
 #include "button.qh"
index 3ad5754..ec76d38 100644 (file)
@@ -7,7 +7,7 @@
 #include <common/constants.qh>
 #include <common/mapinfo.qh>
 #include <common/util.qh>
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 
 float GL_CheckExtension(string ext)
 {
index ed74631..7b3d737 100644 (file)
@@ -1,6 +1,6 @@
 #include "weaponslist.qh"
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 .bool disabled;
 
index d2d15bb..3359f13 100644 (file)
@@ -1,11 +1,11 @@
 #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 "bot/_mod.inc"
+#include "command/_mod.inc"
+#include "mutators/_mod.inc"
+#include "pathlib/_mod.inc"
+#include "weapons/_mod.inc"
 
 #include <common/_all.inc>
 #include <common/effects/qc/all.qc>
diff --git a/qcsrc/server/bot/_all.inc b/qcsrc/server/bot/_all.inc
deleted file mode 100644 (file)
index ae3f973..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#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
deleted file mode 100644 (file)
index 1d31636..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include "default/_all.qh"
index 8f0672e..7c0c288 100644 (file)
@@ -1,2 +1,5 @@
 // generated file; do not modify
 #include <server/bot/api.qc>
+
+#include <server/bot/default/_mod.inc>
+#include <server/bot/null/_mod.inc>
index 33f0b02..3678fc6 100644 (file)
@@ -1,2 +1,5 @@
 // generated file; do not modify
 #include <server/bot/api.qh>
+
+#include <server/bot/default/_mod.qh>
+#include <server/bot/null/_mod.qh>
index 9c52589..59af78c 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 const int WAYPOINTFLAG_GENERATED = BIT(23);
 const int WAYPOINTFLAG_ITEM = BIT(22);
diff --git a/qcsrc/server/bot/default/_all.inc b/qcsrc/server/bot/default/_all.inc
deleted file mode 100644 (file)
index f856187..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#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
deleted file mode 100644 (file)
index 43706ce..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include "havocbot/_all.qh"
index ec73502..03fb7e0 100644 (file)
@@ -5,3 +5,5 @@
 #include <server/bot/default/navigation.qc>
 #include <server/bot/default/scripting.qc>
 #include <server/bot/default/waypoints.qc>
+
+#include <server/bot/default/havocbot/_mod.inc>
index 9252f19..0489627 100644 (file)
@@ -5,3 +5,5 @@
 #include <server/bot/default/navigation.qh>
 #include <server/bot/default/scripting.qh>
 #include <server/bot/default/waypoints.qh>
+
+#include <server/bot/default/havocbot/_mod.qh>
index df874e3..1624676 100644 (file)
@@ -9,7 +9,7 @@
 
 #include "../../weapons/weaponsystem.qh"
 
-#include "../../mutators/_all.qh"
+#include "../../mutators/_mod.qh"
 
 // traces multiple trajectories to find one that will impact the target
 // 'end' vector is the place it aims for,
index 7b742e5..502e253 100644 (file)
@@ -21,7 +21,7 @@
 #include "../../race.qh"
 #include <common/t_items.qh>
 
-#include "../../mutators/_all.qh"
+#include "../../mutators/_mod.qh"
 
 #include "../../weapons/accuracy.qh"
 
@@ -31,7 +31,9 @@
 #include <common/teams.qh>
 #include <common/util.qh>
 
-#include <common/weapons/all.qh>
+#include <server/scores_rules.qh>
+
+#include <common/weapons/_all.qh>
 
 #include <lib/csqcmodel/sv_model.qh>
 
diff --git a/qcsrc/server/bot/default/havocbot/_all.inc b/qcsrc/server/bot/default/havocbot/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/server/bot/default/havocbot/_all.qh b/qcsrc/server/bot/default/havocbot/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 5ccc80a..d23c296 100644 (file)
@@ -11,7 +11,7 @@
 #include <common/constants.qh>
 #include <common/physics/player.qh>
 #include <common/state.qh>
-#include <common/items/all.qh>
+#include <common/items/_mod.qh>
 
 #include <common/triggers/trigger/jumppads.qh>
 
index 1d18a58..51325f4 100644 (file)
@@ -7,7 +7,7 @@
 
 #include <common/t_items.qh>
 
-#include <common/items/all.qh>
+#include <common/items/_mod.qh>
 
 #include <common/constants.qh>
 #include <common/triggers/trigger/jumppads.qh>
index 75a7bcd..271252d 100644 (file)
@@ -1,5 +1,6 @@
 #include "bot_null.qh"
 
+#if 0
 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) { }
@@ -39,3 +40,4 @@ 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
index a5858a9..71e0cd2 100644 (file)
@@ -4,7 +4,7 @@
 #include "race.qh"
 #include "../common/triggers/teleporters.qh"
 
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 
 #include "weapons/tracing.qh"
 
@@ -16,7 +16,7 @@
 
 #include "../common/monsters/all.qh"
 
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 
 #include "../common/triggers/subs.qh"
 
index 68fa35e..0c6f66a 100644 (file)
@@ -18,6 +18,7 @@
 #include "antilag.qh"
 #include "campaign.qh"
 #include "command/common.qh"
+#include "scores_rules.qh"
 
 #include "bot/api.qh"
 
@@ -36,7 +37,7 @@
 #include "../common/net_notice.qh"
 #include "../common/physics/player.qh"
 
-#include "../common/items/all.qc"
+#include "../common/items/_mod.qh"
 
 #include "../common/mutators/mutator/waypoints/all.qh"
 
@@ -1841,6 +1842,8 @@ void ShowRespawnCountdown(entity this)
        }
 }
 
+.float caplayer;
+
 void LeaveSpectatorMode(entity this)
 {
        if(this.caplayer)
diff --git a/qcsrc/server/command/_all.inc b/qcsrc/server/command/_all.inc
deleted file mode 100644 (file)
index b90bed8..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#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
deleted file mode 100644 (file)
index 9b89bcd..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include <common/command/_all.qh>
index 6a9b2b3..8a35bec 100644 (file)
@@ -1,5 +1,5 @@
 #include "banning.qh"
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include "banning.qh"
 
 #include "common.qh"
index 48ac3bf..e23f9bc 100644 (file)
@@ -1,5 +1,5 @@
 #include "cmd.qh"
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 
 #include "common.qh"
 #include "vote.qh"
@@ -12,7 +12,7 @@
 #include "../scores.qh"
 #include "../teamplay.qh"
 
-#include "../mutators/_all.qh"
+#include "../mutators/_mod.qh"
 
 #ifdef SVQC
        #include <common/vehicles/all.qh>
index 8f5b619..357a33e 100644 (file)
@@ -1,5 +1,5 @@
 #include "common.qh"
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include "common.qh"
 
 #include "../scores.qh"
index 0c09006..7fbbddf 100644 (file)
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 REGISTRY(COMMON_COMMANDS, BITS(7))
 #define COMMON_COMMANDS_from(i) _COMMON_COMMANDS_from(i, NULL)
 REGISTER_REGISTRY(COMMON_COMMANDS)
@@ -21,7 +21,7 @@ STATIC_INIT(COMMON_COMMANDS_aliases) {
 #include "vote.qh"
 #include <common/monsters/spawn.qh>
 
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 
 // ============================================================
 //  Shared declarations for server commands, written by Samual
index 1274fcf..2598724 100644 (file)
@@ -1,5 +1,5 @@
 #include "getreplies.qh"
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include "getreplies.qh"
 
 #include "../race.qh"
index 5f7533d..acf2d40 100644 (file)
@@ -1,5 +1,5 @@
 #include "radarmap.qh"
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include "radarmap.qh"
 
 #include "../g_world.qh"
index f0efcba..a329ac9 100644 (file)
@@ -1,5 +1,5 @@
 #include "sv_cmd.qh"
-#include "_all.qh"
+#include "_mod.qh"
 
 #include "banning.qh"
 #include "cmd.qh"
@@ -18,7 +18,7 @@
 
 #include "../bot/api.qh"
 
-#include "../mutators/_all.qh"
+#include "../mutators/_mod.qh"
 
 #include <common/constants.qh>
 #include <common/mapinfo.qh>
index d03ed34..361f128 100644 (file)
@@ -1,5 +1,5 @@
 #include "vote.qh"
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include "vote.qh"
 
 #include "common.qh"
@@ -10,7 +10,7 @@
 #include "../round_handler.qh"
 #include "../scores.qh"
 
-#include "../mutators/_all.qh"
+#include "../mutators/_mod.qh"
 
 #include <common/constants.qh>
 #include <common/mapinfo.qh>
index 53aa317..f233bb7 100644 (file)
@@ -1,7 +1,7 @@
 #pragma once
 
 float warmup_limit;
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/stats.qh>
 
 #define INDEPENDENT_ATTACK_FINISHED 1
@@ -12,20 +12,6 @@ float g_footsteps, g_grappling_hook, g_instagib;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;
 float warmup_stage;
-PROPERTY(float, g_pickup_respawntime_weapon)
-PROPERTY(float, g_pickup_respawntime_superweapon)
-PROPERTY(float, g_pickup_respawntime_ammo)
-PROPERTY(float, g_pickup_respawntime_short)
-PROPERTY(float, g_pickup_respawntime_medium)
-PROPERTY(float, g_pickup_respawntime_long)
-PROPERTY(float, g_pickup_respawntime_powerup)
-PROPERTY(float, g_pickup_respawntimejitter_weapon)
-PROPERTY(float, g_pickup_respawntimejitter_superweapon)
-PROPERTY(float, g_pickup_respawntimejitter_ammo)
-PROPERTY(float, g_pickup_respawntimejitter_short)
-PROPERTY(float, g_pickup_respawntimejitter_medium)
-PROPERTY(float, g_pickup_respawntimejitter_long)
-PROPERTY(float, g_pickup_respawntimejitter_powerup)
 float g_jetpack;
 
 float sv_clones;
index 5ec8141..612528a 100644 (file)
@@ -2,14 +2,14 @@
 
 #include "bot/api.qh"
 #include "g_hook.qh"
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 #include "scores.qh"
 #include "spawnpoints.qh"
 #include "../common/state.qh"
 #include "../common/physics/player.qh"
 #include "../common/t_items.qh"
 #include "../common/vehicles/all.qh"
-#include "../common/items/all.qc"
+#include "../common/items/_mod.qh"
 #include "../common/mutators/mutator/waypoints/waypointsprites.qh"
 #include "weapons/accuracy.qh"
 #include "weapons/csqcprojectile.qh"
@@ -21,7 +21,7 @@
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"
 #include "../common/util.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 #include "../lib/csqcmodel/sv_model.qh"
 #include "../lib/warpzone/common.qh"
 
@@ -111,6 +111,8 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype)
                UpdateFrags(attacker, f);
 }
 
+.entity kh_next;
+
 string AppendItemcodes(string s, entity player)
 {
        int w = PS(player).m_weapon.m_id;
index eb6a1cb..019c8fc 100644 (file)
@@ -7,7 +7,7 @@
     #include <common/constants.qh>
     #include <common/teams.qh>
     #include <common/util.qh>
-    #include <common/weapons/all.qh>
+    #include <common/weapons/_all.qh>
     #include "weapons/accuracy.qh"
     #include "weapons/csqcprojectile.qh"
     #include "weapons/selection.qh"
@@ -17,7 +17,7 @@
     #include "defs.qh"
     #include <common/notifications/all.qh>
     #include <common/deathtypes/all.qh>
-    #include "mutators/_all.qh"
+    #include "mutators/_mod.qh"
     #include <common/turrets/sv_turrets.qh>
     #include <common/vehicles/all.qh>
     #include <lib/csqcmodel/sv_model.qh>
index 1684573..46508a9 100644 (file)
@@ -13,7 +13,7 @@
 #include "../common/vehicles/all.qh"
 #include "../common/constants.qh"
 #include "../common/util.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 #include "../lib/warpzone/common.qh"
 #include "../lib/warpzone/server.qh"
 
index a04d6d4..657ac07 100644 (file)
@@ -13,7 +13,7 @@
 #include "g_hook.qh"
 #include "ipban.qh"
 #include "mapvoting.qh"
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 #include "race.qh"
 #include "scores.qh"
 #include "teamplay.qh"
@@ -32,8 +32,8 @@
 #include "../common/triggers/trigger/secret.qh"
 #include "../common/triggers/target/music.qh"
 #include "../common/util.qh"
-#include "../common/items/all.qh"
-#include "../common/weapons/all.qh"
+#include "../common/items/_mod.qh"
+#include <common/weapons/_all.qh>
 #include "../common/state.qh"
 
 const float LATENCY_THINKRATE = 10;
index c797c57..4660a43 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "../common/minigames/sv_minigames.qh"
 
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 #include "../common/vehicles/sv_vehicles.qh"
 
 #include "../common/mutators/mutator/waypoints/waypointsprites.qh"
index a88b4be..530e43f 100644 (file)
@@ -4,12 +4,12 @@
 #include "constants.qh"
 #include "g_hook.qh"
 #include "ipban.qh"
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 #include "../common/t_items.qh"
 #include "weapons/accuracy.qh"
 #include "weapons/csqcprojectile.qh"
 #include "weapons/selection.qh"
-#include "../common/command/_all.qh"
+#include "../common/command/_mod.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/mapinfo.qh"
 #include "../common/triggers/subs.qh"
 #include "../common/util.qh"
 #include "../common/turrets/sv_turrets.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 #include "../common/vehicles/sv_vehicles.qh"
 #include "../common/vehicles/vehicle.qh"
-#include "../common/items/all.qc"
+#include "../common/items/_mod.qh"
 #include "../common/state.qh"
 #include "../common/effects/qc/globalsound.qh"
 #include "../lib/csqcmodel/sv_model.qh"
diff --git a/qcsrc/server/mutators/_all.inc b/qcsrc/server/mutators/_all.inc
deleted file mode 100644 (file)
index 65d7092..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
-
-#include "mutator/_all.inc"
diff --git a/qcsrc/server/mutators/_all.qh b/qcsrc/server/mutators/_all.qh
deleted file mode 100644 (file)
index bae58a5..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "_mod.qh"
-
-#include "mutator/_all.qh"
index 582c285..f0108de 100644 (file)
@@ -1,2 +1,4 @@
 // generated file; do not modify
 #include <server/mutators/loader.qc>
+
+#include <server/mutators/mutator/_mod.inc>
index 9ba0319..9888c94 100644 (file)
@@ -1,2 +1,4 @@
 // generated file; do not modify
 #include <server/mutators/loader.qh>
+
+#include <server/mutators/mutator/_mod.qh>
index 64577fa..ba3e48f 100644 (file)
 #include <common/stats.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
-#include <common/command/_all.qh>
+#include <common/command/_mod.qh>
 #include <common/net_notice.qh>
 #include <common/animdecide.qh>
 #include <common/monsters/all.qh>
 #include <common/monsters/sv_monsters.qh>
 #include <common/monsters/spawn.qh>
 #include <common/weapons/config.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <server/weapons/accuracy.qh>
 #include <server/weapons/common.qh>
 #include <server/weapons/csqcprojectile.qh>
@@ -79,7 +79,7 @@
 
 #include <server/bot/api.qh>
 
-#include <server/command/_all.qh>
+#include <server/command/_mod.qh>
 
 #include <common/monsters/all.qh>
 
index d00a20b..9c13e1b 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <server/bot/api.qh>
 
-#include <server/command/_all.qh>
+#include <server/command/_mod.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
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/server/mutators/mutator/_all.qh b/qcsrc/server/mutators/mutator/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 0807ea4..608517f 100644 (file)
@@ -2,7 +2,7 @@
 
 #include <common/mutators/mutator/instagib/items.qc>
 #include <server/campaign.qh>
-#include <server/command/_all.qh>
+#include <server/command/_mod.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
deleted file mode 100644 (file)
index 73539f9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "pathlib.qh"
-
-#include "costs.qc"
-#include "expandnode.qc"
-#include "main.qc"
-#include "movenode.qc"
-#include "path_waypoint.qc"
-#include "utility.qc"
-#if DEBUGPATHING
-       #include "debug.qc"
-#endif
diff --git a/qcsrc/server/pathlib/_all.qh b/qcsrc/server/pathlib/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index 6b89bb6..fdb95d2 100644 (file)
@@ -1,5 +1,4 @@
 #include "costs.qh"
-#include "pathlib.qh"
 
 float pathlib_g_static(entity parent,vector to, float static_cost)
 {
index 6f70f09..811c031 100644 (file)
@@ -1 +1,2 @@
 #pragma once
+#include "pathlib.qh"
index 0a350df..b84ae64 100644 (file)
@@ -1,5 +1,6 @@
 #include "debug.qh"
-#include "pathlib.qh"
+
+#if DEBUGPATHING
 
 MODEL(SQUARE,       "models/pathlib/square.md3");
 MODEL(SQUARE_GOOD,  "models/pathlib/goodsquare.md3");
@@ -119,3 +120,5 @@ void pathlib_showedge(vector where,float _lifetime,float rot)
     //e.angles_x += 90;
 
 }
+
+#endif
index 6f70f09..811c031 100644 (file)
@@ -1 +1,2 @@
 #pragma once
+#include "pathlib.qh"
index a9d9600..12083e4 100644 (file)
@@ -1,14 +1,14 @@
 #include "portals.qh"
 
 #include "g_hook.qh"
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/notifications/all.qh"
 #include "../common/triggers/teleporters.qh"
 #include "../common/triggers/subs.qh"
 #include "../common/util.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 #include "../lib/csqcmodel/sv_model.qh"
 #include "../lib/warpzone/anglestransform.qh"
 #include "../lib/warpzone/util_server.qh"
index 743f981..93421a7 100644 (file)
@@ -4,7 +4,7 @@
 #include "_all.inc"
 #endif
 
-#include <ecs/_lib.inc>
+#include <ecs/_mod.inc>
 
 #if BUILD_MOD
 #include "../../mod/server/progs.inc"
index f2a6265..94bea2b 100644 (file)
@@ -1,7 +1,7 @@
 #include "scores.qh"
 
 #include "command/common.qh"
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"
 
index cc020b8..5672179 100644 (file)
@@ -1,6 +1,6 @@
 #include "spawnpoints.qh"
 
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 #include "g_world.qh"
 #include "race.qh"
 #include "../common/constants.qh"
index 15d4269..1bb6974 100644 (file)
@@ -8,7 +8,7 @@
 
 #include "command/common.qh"
 
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 #include "weapons/csqcprojectile.qh"
 
 #include "../common/constants.qh"
@@ -18,7 +18,7 @@
 #include "../common/util.qh"
 
 #include "../common/vehicles/all.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 
 #include "../lib/csqcmodel/sv_model.qh"
 
index 8589ecc..dac8f19 100644 (file)
@@ -1,6 +1,6 @@
 #include "t_quake.qh"
 
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 
 spawnfunc(weapon_electro);
 spawnfunc(weapon_hagar);
index 1bdb497..1e71d33 100644 (file)
@@ -1,6 +1,6 @@
 #include "t_quake3.qh"
 
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 
 spawnfunc(weapon_crylink);
 spawnfunc(weapon_electro);
index 974495b..a193423 100644 (file)
@@ -9,10 +9,10 @@
 
 #include "command/vote.qh"
 
-#include "mutators/_all.qh"
+#include "mutators/_mod.qh"
 
 #include "../common/deathtypes/all.qh"
-#include "../common/gamemodes/_all.qh"
+#include "../common/gamemodes/_mod.qh"
 #include "../common/teams.qh"
 
 void TeamchangeFrags(entity e)
index 865d3f7..e6d6f66 100644 (file)
@@ -2,10 +2,10 @@
 
 #include "autocvars.qh"
 #include "client.qh"
-#include "command/_all.qh"
+#include "command/_mod.qh"
 #include "weapons/common.qh"
 #include "weapons/selection.qh"
 #include <common/items/item.qh>
 #include <common/physics/player.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/vehicles/all.qh>
diff --git a/qcsrc/server/weapons/_all.inc b/qcsrc/server/weapons/_all.inc
deleted file mode 100644 (file)
index 8bc63f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "_all.qh"
-#include "_mod.inc"
diff --git a/qcsrc/server/weapons/_all.qh b/qcsrc/server/weapons/_all.qh
deleted file mode 100644 (file)
index 947026d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "_mod.qh"
index c2ed3fe..ed9006b 100644 (file)
@@ -1,10 +1,10 @@
 #include "accuracy.qh"
 
-#include "../mutators/_all.qh"
+#include "../mutators/_mod.qh"
 #include <common/constants.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 int accuracy_byte(float n, float d)
 {
index 954f825..03031c1 100644 (file)
@@ -5,8 +5,8 @@
 #include <common/deathtypes/all.qh>
 #include <common/notifications/all.qh>
 #include <common/util.qh>
-#include <common/weapons/all.qh>
-#include <common/items/all.qc>
+#include <common/weapons/_all.qh>
+#include <common/items/_mod.qh>
 
 void W_GiveWeapon(entity e, int wep)
 {
index caa367e..a8a893e 100644 (file)
@@ -5,7 +5,7 @@
 #include "../command/common.qh"
 
 #include <common/constants.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 .float csqcprojectile_type;
 
index ec1fd08..372f735 100644 (file)
@@ -2,7 +2,7 @@
 
 #include "../antilag.qh"
 #include "../g_subs.qh"
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/state.qh>
 
 vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v)
index ff5eaa5..8c6c0ea 100644 (file)
@@ -5,7 +5,7 @@
 #include <common/constants.qh>
 #include <common/util.qh>
 #include <common/items/item.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/state.qh>
 #include <common/mutators/mutator/waypoints/waypointsprites.qh>
 
index 89b4f26..bb204a4 100644 (file)
@@ -1,9 +1,9 @@
 #include "spawning.qh"
 
 #include "weaponsystem.qh"
-#include "../mutators/_all.qh"
+#include "../mutators/_mod.qh"
 #include <common/t_items.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 string W_Apply_Weaponreplace(string in)
 {
index 398dcdd..c06b90e 100644 (file)
@@ -1,7 +1,7 @@
 #include "throwing.qh"
 
 #include "weaponsystem.qh"
-#include "../mutators/_all.qh"
+#include "../mutators/_mod.qh"
 #include <common/t_items.qh>
 #include "../g_damage.qh"
 #include <common/items/item.qh>
@@ -9,7 +9,7 @@
 #include <common/notifications/all.qh>
 #include <common/triggers/subs.qh>
 #include <common/util.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/state.qh>
 
 void thrown_wep_think(entity this)
index 85551aa..68714da 100644 (file)
@@ -12,7 +12,7 @@
 #include <common/constants.qh>
 #include <common/util.qh>
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/state.qh>
 
 #include <lib/warpzone/common.qh>
index 2b4be7e..2ffb1c1 100644 (file)
@@ -2,7 +2,7 @@
 
 #include "../g_world.qh"
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 void WeaponStats_Init()
 {
index f3851f5..1e42121 100644 (file)
@@ -3,7 +3,7 @@
 #include "selection.qh"
 
 #include "../command/common.qh"
-#include "../mutators/_all.qh"
+#include "../mutators/_mod.qh"
 #include "../round_handler.qh"
 #include <common/t_items.qh>
 #include <common/animdecide.qh>
@@ -11,7 +11,7 @@
 #include <common/monsters/all.qh>
 #include <common/notifications/all.qh>
 #include <common/util.qh>
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/state.qh>
 #include <lib/csqcmodel/sv_model.qh>
 
index 5998184..9a3ba10 100755 (executable)
@@ -27,10 +27,21 @@ function genmod() {
             if [[ -f "ui_${f%.qc}.qh" ]]; then echo -e "#ifdef MENUQC\n    #include <${CTX}ui_${f%.qc}.qh>\n#endif" >> ${MOD}.qh; fi
         fi
     done
-    # echo >> ${MOD}
+    declare -l rec=1
+    if [[ -f "_all.inc" ]]; then rec=0; fi
     for f in *; do if [ -d "$f" ]; then
         (cd -- "$f" && genmod)
-        # echo "#include \"$f/MOD\"" >> ${MOD}
+        if [[ $rec == 1 ]]; then
+            rec=2
+            echo >> ${MOD}.inc
+            echo >> ${MOD}.qh
+        fi
+        if [[ $rec != 0 ]]; then
+            declare -l mod=_mod
+            if [[ -f "$f/_all.inc" ]]; then mod=_all; fi
+            echo "#include <${CTX}$f/${mod}.inc>" >> ${MOD}.inc
+            echo "#include <${CTX}$f/${mod}.qh>" >> ${MOD}.qh
+        fi
     fi; done
 }
 
index e40fb39..7f86db1 100755 (executable)
@@ -46,5 +46,3 @@ function check() {
 check client
 check server
 check menu
-
-# TODO: check that "_mod.(qc|inc)" is not included except by "_all.(qc|inc)"