]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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 0c401acb0b0e1db8d02ac53616842518536a92db..f592f8adb1850f4f12a106b8e66ced08bce1fc2b 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 4c8e915906e551b31b5880bd22a72a4f6b38b06e..631090cc1f9b7d119a2a9847b9d6ee5619cdd568 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 f400d5d00d22957e094f3966a953525f1f05b71f..aa785a9e94c5524789bf7e47dbe0adeebe6ed8c3 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 0ac7251308b3e26f4d167bc79ae6452a39bfa18c..2d4850d521d360565cacf66e4dabf3e7949f6d66 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 760f5d438a8a305aae294ab0f3521dbd26fb1157..8b23dd6fb95a6c8559877d99a1ed428c26e45249 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 a895af36038e33d51760fd0965cd803b596953f3..0dc89a8b4dffbb0b87ddeb4fcf12982409b506a7 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 223bf72ce8efae4a679f8c6405673deaf1aac283..7f8703f5b685449e8341292fa1af5e3ede97515b 100644 (file)
@@ -1,6 +1,6 @@
 #include "powerups.qh"
 
-#include <common/items/all.qc>
+#include <common/items/_mod.qh>
 
 // Powerups (#2)
 
index 1ceab88e9ad33a8d851e539de8192a99315c9573..22a9827acc3f2a12b6b305db7bc4dc7aaac0a636 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 b23a77053031c7938c83f11a7e48d32eecc6747d..d49548084a3e04726242bff8bfafd36f63c42daf 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 afd0b5e38c96be69d22b400022a0be49429a786a..49167845d414d56a6dfa68d77b58330246baa8ea 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 c397c882c9c8aa96a51707c27634740ea021656e..89f540778e97f21d32dbaa8d8eb09a43fab05a1a 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 9b9833286cedf7dee5e001430804c5a61f2472cc..33fd015cce8f8724a5403d6024b3ea7f79a1f379 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 cd08bf188bc86a9626f0939b12f99274cc4c137a..7341a01d906fe6f7646878b454f0edecb9e0d79c 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 9797abfb1eae1586dc0ad37e2b5b4f1256b3a2f6..75ef40521ea443504048bb7669c161db0f671fda 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 84fba6ca68bb2c08306ac62309b004bff41f5e65..9c4544bba08c0afce4ed04c14b8546d979da4d70 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 86b2db13f13ad319202d265d5c7050918db05998..336707d3cf96fc7c0bf78bc7f6ebd263156fe818 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 ef1e03e19f8b8a3fc02bce1a2f9c6380073ad11d..7b284dc1dfebe766c5fa11a577bf463e30b050bd 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 5693329182ef4b95861797abd74fb3c85fd1d259..2fcdf0c351052c30443ed871d2ea59d1e672fd82 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 6975259c17783f683e86e5717d0198e1e0106f51..d5dab8cad27418e143cb9aa8bf63f962e061711e 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 3f5ed82198904e347d7ad9850c4fab8eb4e6c8a2..8d6e8ed18c98e59ad7e3943100732bcb6b862932 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 d17502e81ba99fcf0c11eb49c2182c0a0c4fce1d..b72f38e0882ceac7c1d11215c95baf26b098700b 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 98fb4815c1ce28cc699a429537ea75c2643b4487..c3cec69dc5268cddd04a9afb11e422e4bf3b3a71 100644 (file)
@@ -1 +1,3 @@
 // generated file; do not modify
+
+#include <common/gamemodes/gamemode/_mod.inc>
index 98fb4815c1ce28cc699a429537ea75c2643b4487..685c277b4e18bf7771f2852d40138ad39dc14063 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 98fb4815c1ce28cc699a429537ea75c2643b4487..2fc2c404678883117dcd9205365e36317f5e997e 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 98fb4815c1ce28cc699a429537ea75c2643b4487..d79957012609493478bdf9e0a03ea2116fec63c3 100644 (file)
@@ -1 +1,4 @@
 // generated file; do not modify
+
+#include <common/gamemodes/gamemode/nexball/_mod.qh>
+#include <common/gamemodes/gamemode/onslaught/_mod.qh>
index c8f94c9d800a2e29cca0be9c21afbc04d28a2fc2..f70ba3c55c678e2c0470c07ce620d3356251266d 100644 (file)
@@ -1,3 +1,5 @@
+#pragma once
+
 float autocvar_g_onslaught_point_limit;
 void ons_Initialize();
 
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 3b5dd9550f26286b0ad64b35916fce48dbb1fdc4..6214fac042b7783f96bae24935208873061a9d3f 100644 (file)
@@ -1,2 +1,4 @@
 // generated file; do not modify
 #include <common/items/all.qc>
+
+#include <common/items/item/_mod.inc>
index 158814c5570bbf929537dbe6bf473e864fc50b50..a04e90b1dce9ef7801f36cccd55094c4efc11ecc 100644 (file)
@@ -1,2 +1,4 @@
 // generated file; do not modify
 #include <common/items/all.qh>
+
+#include <common/items/item/_mod.qh>
index ab77f3071e975671cd3cec3e915037bfc5b25c0a..7782cda0d6d1518c47de858484a6123974dcde45 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 73bd502c8fa13a8a1c1a05b3545a099e16dba1a8..41cd424987fddd562b80a6a6d1ed7aa06b55b6e2 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 525a5b3d930a14d07fb47ca546a1dd41b94ef7d0..d7e0dcc6872d0d55b9d7b00aad234920acf5cb45 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 56c9369192899010fdbabda6d5408028410ae4bd..d2ef10a4f96178a8d6ffa0a09af89d3adc25b096 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 f8669e0e08503baa95529bef70f2424944ceb159..cca0b541843613470a8d49e0e530283bc2d356de 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 9078b636d4322b0ac369f8b4dbc2f44f4189baa1..cb41abc295618c3816c9028955fe79e65c3ff443 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 93ba2f36e2ab1669bd3b707db541b9a85eac0bd3..49a34c1c8ee280f159139311ae4b245c91a23c4f 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 8eb463a8f97ddc9ed66c562748c1fe0732fe8ad3..79933870fc2b5535995dfec18d244e76cd0c5c69 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 7fd29e299f57f0034fde2b701fdfe949666f4c34..ec09d5c45d62d904c6e4a2ada5ec570ae3b5c4bc 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 6f70f09beec2219624baeca92e2cd7deaa104fb4..67f308c2a6820d8c8c913f2eb9c5d29d198f590e 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 136c8dab6dbf73c633ab35b548134611e6c9b7a3..5bd5da774d0ea09c205dcdd1da5048e63273ea51 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 375f958a16ddb798c93ab5de7fdfe48f404dabbd..7c7405b75bb4e34dcad03f2260454c637f19ef48 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 ca17c970bab7aa01066c61e04f0289062314b82e..f0745b6c294069460ab0068957e5c1181c7d53a6 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 2bc84c4593afec5e62a5ddcbbfc689cd2c92d71f..9ef75a6b294b63c46a4496a23f82a91ec713aaca 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 66693ef2ab6c20078adff68c6d48f5771df9c784..4171f475cd747c5c7bea37c8e026615dbbea11b1 100644 (file)
@@ -9,3 +9,5 @@
 #ifdef SVQC
     #include <common/minigames/sv_minigames.qc>
 #endif
+
+#include <common/minigames/minigame/_mod.inc>
index 9c337600308f1e7a4b4228d91576e91d9ffa6a98..e0daf8f6775f01fa6c363b300b55f0c547f07987 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 3abacacca12430efacb80d32a2fa128ebcad4064..fa3f65193ae5725bc0e4a87806433875344a23f3 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 d49489f134b8f2d0f70c9f629dae4f8ba78eb5b6..84f7a0d78f6d19d4121334681655c170e19f2569 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 509fa0aca11bc6cfdc277af9c14f545d081e13ce..e23f77a4d2e8b090fe8061d8fc2086b38cdd6922 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 9fa73508c1bcb4327d2ad7067a7e066cc5b365b9..ad7fb9ff320ae33eb2dfacd6698e5dec0c3fb52b 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 33a3c445991c274ed87a520d4d326afb4850eabe..eab14131da05a1f9c814c61f955cebc739112209 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 beca5ebbd5f383f6bae3a5f3ef9230b768dbdd8f..9a45e856a74570c704ca9d6497c662b296ca1ee3 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 98fb4815c1ce28cc699a429537ea75c2643b4487..29d6deabb9dd39935fa31ab4fd69a16243d61f6d 100644 (file)
@@ -1 +1,3 @@
 // generated file; do not modify
+
+#include <common/mutators/mutator/_mod.inc>
index 98fb4815c1ce28cc699a429537ea75c2643b4487..b19e9c4d70ff03b759cb9f4bd56c7dcbbf3990f3 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 98fb4815c1ce28cc699a429537ea75c2643b4487..294047d500527146349f13811e9c6368e297d53d 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 98fb4815c1ce28cc699a429537ea75c2643b4487..de43630bedbdd822f9afe88cdad9ebcbf64489e3 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 89c550f7a911c5d6be277475ef6aba7834a03fdc..2b4291ff3902401227fcf7d771f3217dcf0de73e 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 0ea6b057a962efc045f8574f8f4518653a0dbfde..d9223b302a13b771f34e11b55c8bb7077e08f01c 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 269ec2d245ea02cc473e1345cd02aad9b585e598..65decbf40f10f79806d7ee08e9ed6ef989789ecf 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 6176ebbabbdf4e8fe019bf3e934d15d3c1d8a65e..0cf3ed978134babe2cc6135d237e3b3b197e934f 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 b8d100786441391889863a9485c9d450cd0009fc..d907864ef490c9ba5d7c5f530e4d8415701fb8a0 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 6d5ac80866385da5e23652ca92b26fc6617db78c..ea7ed953ce45aa86ed3193740c8c3cf0edb968a0 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 26e4058d24975ba686619ca785271826065e6a0d..6a420b734eacd1dcdf74dd37846cfc4d025cc48f 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 49d2c57b70c3a2cf45609ae45ae611c670e054ce..5d8e9341ce9523f9c3ee55e10b0fc32ecc427821 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 e66ea3f0a5ea15c007b164fcde1b76c24960bf30..1fd7f108f57f2cb3b3d2e79f6a6d5d869817da17 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 3a61cd4e9a433c03742c10a5233e4a044f32c181..100aecae29a006bcecf6caf42162815d30f76086 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 39dacad8e2817c9aad232c4b59a8348df012fb7e..377a7b340d8527720af548e8926af06d634a8804 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 ad58221269f0466b1733733a2b925982f10a5504..56ffccea773c012b3dd4464442a8f0f2baf77caf 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 32e718ae296cb4734941d3549918e2943a1fe046..ebc971141447e77c2a5a72ad18f11e05746b392b 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 c049b10828d94f28669e578f2e2d53ce082f307f..9b327de55d23fc0f59fbc9e8b7a34e267ccbcaf1 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 2fba6046172541db1c2324c936fd81f8d57eecaa..d3bb2dc3addb2764d6a6cd71e6f8ee115b305160 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 99eb846c7305be7dafb0c711bfd28637241c3eed..e204d3a25aee8b2f71c4c0898651990143ef5dc1 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 ec62c248c14cde57c4874a3c9247e7ed20ccf804..469a64c9274b240758ebd40eeeb8d4f19576d767 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 cbb0379f04b5a9cf8023d4aaf6710a8c01b65006..1a77e989121b0cade1ab49e584f93e6e575b29d4 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 649fd51ae697eb4454871b8aa063cb1612f49419..8e5239702866c4c6fe4519a7c34d67f2aa00b7fd 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 5a14b647d12abe94bc500408dcc66fd02636dd28..251df22839e750646abef244455aa63d7e846df5 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 779076a7436293785a7d807b3d426355f6a341a2..158492f661e7e1326cc248283c3b4841bb64c76a 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 73fed55e1cfaecd936a1419ea88926052a5460e9..d4ed9505b987646aaff37d154fbae1e34ebf6f47 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 fc9e352542c3a00c76cc2209241b7247bfec01b5..51c20ef9d0244a4dd994b5ed00e4570d224e0b77 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 0b3af4169d143dafdf42243d246b1c4e0ddf1e13..4260d4292ee47649ba2b8592756c2be0116e78aa 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 61e2b02501fc74e14eb6f064304116dde8415936..a1523045a6ca000ee6eab8119fead769288dc31f 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 81790e6c02e31939fc7d66aebe6c34fc5d080870..6547507864a632c1fe514f1f4746155fc8bef914 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 113ae8306d693984b5fbdb8409dafb1f766ecea8..28fbd9c3cda64b2a95f105f8dd49117ab9683141 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 73d9b938efac9bdcc4917352b3833665a1dae105..c35b1930c44672995718ab746454da9aabfcd243 100644 (file)
@@ -1,3 +1,5 @@
+#include "calculations.qh"
+
 // =============================
 //  Explosion Force Calculation
 // =============================
index 05eb9d9baf299ff4455f06eabed1adea87294587..c349eeca4f355a3b8b55ee588e65cfaf5471739e 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 a08be2e61d5391c406668e6f5039146ba4748518..c525bb81b954ef1d90a5fbe49c3547442a22708a 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 683c3a91d51b62387b58e61b442e5aa4b8cbef7c..48b7069b243578bea80576dc3d4a3c7715c12e6e 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 4d8bc34da3725bdfce12326f8f29b3d47be62c90..0d1ff4482fc08063cbcbeaab8920cb3aa5246ccb 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 9b7bf3523810b7754d0c302682a6d912edb1968f..724cb1ef8963bf8eb7ddeb447a1f0e5bbf15af53 100644 (file)
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "lib.qh"
+
 void systems_update();
index cdacdc64c07bdc4fd6052832ed2e1e305783e77b..a5204fa052d6804677c912c8e5d789e8b2ff31a9 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 cff5be75890ec42062ed7f95db63500d54c91e2a..90e3cd76c983a803a552b32ed7af220aaccb6b6e 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 bff21970225e417191aa20600783f8070bb45561..34ea2610dedd7afa60e30ce6bab89f7df643940a 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 bebbdcc199dc01377ddb78bab427a973239eccdc..e5198f591629d4fab9ba62d5193a77d4a26d50e1 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 fb0ac17993edc742722fd08ae7c2a2c4b3c8b1b2..72aadf6247bac401778744fe630ea81443979fba 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 22934ca908fcf3fcc916f61cae51b2a75630110c..aaa33b137b8ecdcd14fc61d86ec85c7a30c0253b 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 f2f7f5c8e4862fe96cb94e4aaf5ccff6f23221d5..07fe09c100e0bd4a09498dec63b9a6f1bdbdea38 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 27e488164be5065733501571283131907c86a012..2d093a2ed5fe23078604a10fdfdbe5606d9a2966 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 3ad57544888ddbb652bc5c15da210e152e63c599..ec76d389e6cd8d9206162aa7645dc8527a8ab3b8 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 ed74631dead1b7454724cbe937cb6db0bdf6b72c..7b3d7375b7760018cf4ab267e3f8d2daab6bc137 100644 (file)
@@ -1,6 +1,6 @@
 #include "weaponslist.qh"
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 .bool disabled;
 
index d2d15bb92a447c9a41f25e7e127c2bccf6f13781..3359f13b120f2e40178127ddef25c685ea2e5bea 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 8f0672e2623074a3db074eb081ff4bb1c8617ca3..7c0c2882e990915ba7501a21511f2e75469eb62d 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 33f0b022911f943822c9b9a9c1ebc27f6e126c89..3678fc69f192bbf66634aa6c66b181dfa6a183e8 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 9c525892f952cc9d26d7d8faabc6679a0b111153..59af78cb086c2181d662cf68c060a2cced87b5c3 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 ec73502c3e56d61efdacc510622636baf9070f60..03fb7e0f5bc0893d927a28e8f2b7e9bdba380678 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 9252f195e63618fa9401fcd2aed4c244d392301e..04896279bf028c547297c507fa66b6bbe21a8e82 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 df874e3ebc9f47e252a2cf19172bb00a12a8427f..1624676b82ca032b0a7d8d4c65589a1a8d2934bc 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 7b742e5aa976fedb22679fd32e71ff2d0b1caed8..502e2532c6924add3d39208cbf90298d6781f450 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 5ccc80a3a026fa43f6c2e7ea2b59f5a978d898bb..d23c29675a70fa7bc5d2944922f143ee6a7c9a28 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 1d18a582ed3864c10d1d3f4063c30dfd91e0f040..51325f4f966c10349070f2ac7b9bbb898eb2dc8c 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 75a7bcd111df4da17964d4b7376a6402d2048594..271252dee96b47c028839ce4967289e97372e690 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 a5858a9e068f65605d6382b7bef941b985d7e0c8..71e0cd2e861805db6342b4203e39066b85ac39bc 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 68fa35e00597c17aa2009afb87d2c371bd8e6fbd..0c6f66a2cc2cbc23347298bf54582a29d827ecdb 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 6a9b2b36145e5ec397ab01bbcf782e7fab39e757..8a35bec2925c2f89658dfe7145308e56dabb0c2a 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 48ac3bff5611d87f170c5dac6f1addb28fe9c74d..e23f9bc9892a70ddf649f69ee7f7725b9bc66035 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 8f5b619fd0e254fbdf444346be4072a520dd144e..357a33eba2d5d1cb398a138883ccd83b606fcca5 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 0c09006ee32e7248bf98ee8e386ff1d4bcab4e99..7fbbddf7d799f5c7e7d100537dba926956c84a38 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 1274fcf5f7497c61542871a63bf5d0c8d7e7c6b7..2598724717a72b3b3bdf5d22fd3168895cb55fe1 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 5f7533d7d9442480cec12a225b2e4895fe8e3397..acf2d40aee5233935b6569cb445a0c52c4d1ca88 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 f0efcba46725bd4c2ce6fad8e0ab56bbc7d44a65..a329ac9965efe463b052d92a24ac64b6ccddea1a 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 d03ed3489db1bb732fd75feb84dc93a78b370a74..361f1284436f9f85520c4902d80dfae92ea58203 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 53aa317e6874c97cba35cde6a7f3276284a9de3b..f233bb7d8f41c5612ce300dc99862c202912b9ae 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 5ec8141e0d8a21bef0d963e3bd194e0b01d24848..612528a61bd32dc32c483d1f32b673754ddd54cb 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 eb6a1cba0a205a08eaf9ece2ce4f6931e54e9fb8..019c8fc9a8efc92bc5d280f2352d796acd99f574 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 1684573281b46e01d9a0ba531821ce8328997fd7..46508a9191162f34554428248f7d6118a221d41f 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 a04d6d440b49c55dfc83b7d569c0e15cabefa51d..657ac07cb683243d78b0d034b8822f73d4122eee 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 c797c577101bab19df58bb5fdb9985293034e02f..4660a433ba543fee479e6c053a4d629d3a926ad5 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 a88b4be5679635121b56692ea4b38487b634037b..530e43f4a6a0392e2bd6d10b66a929829d5f9136 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 582c2852f38d8a3482dcd0055a6d773e2fc3cf71..f0108dec37f6f31717305564d5678040008018d4 100644 (file)
@@ -1,2 +1,4 @@
 // generated file; do not modify
 #include <server/mutators/loader.qc>
+
+#include <server/mutators/mutator/_mod.inc>
index 9ba0319fe4d4275b118facf80c33d57165cdadd2..9888c94666bfd085a8abe873054f7de7563ea469 100644 (file)
@@ -1,2 +1,4 @@
 // generated file; do not modify
 #include <server/mutators/loader.qh>
+
+#include <server/mutators/mutator/_mod.qh>
index 64577fa6bff0ba4a8b246da528e3b89431819935..ba3e48f17c1d5bba002d5c0f30e0d835ee405955 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 d00a20b0fc4d95a3be9f26b16f30929ee575370b..9c13e1bb63e7393269853cafafb431d41f2ee8e4 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 0807ea4450b1e61d27c7ce7c73b147b61538003f..608517fbffc99e838903461d3b81201d893bf447 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 6b89bb640223c1776d48cf5f152f285789258868..fdb95d2f608b967be48675f96e549975693e766e 100644 (file)
@@ -1,5 +1,4 @@
 #include "costs.qh"
-#include "pathlib.qh"
 
 float pathlib_g_static(entity parent,vector to, float static_cost)
 {
index 6f70f09beec2219624baeca92e2cd7deaa104fb4..811c031aff3d968a056e6dffa974179a409ce321 100644 (file)
@@ -1 +1,2 @@
 #pragma once
+#include "pathlib.qh"
index 0a350df2c2f467f4ed03958639fd31607b7dd133..b84ae6414e20ba637d8f81c86bf946040bf37cb5 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 6f70f09beec2219624baeca92e2cd7deaa104fb4..811c031aff3d968a056e6dffa974179a409ce321 100644 (file)
@@ -1 +1,2 @@
 #pragma once
+#include "pathlib.qh"
index a9d9600a759096b2b9c48d63f64fd607020766b3..12083e423cb573b940c3c82c9453450447f6c096 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 743f981edb151725bbd95de928242cf42e8971a4..93421a7e88af1f5e3a909e68a4d073b4db02cf77 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 f2a6265ae73894b8ea9e061c69e3b38f7cac0365..94bea2b44a662428e8259e36a0b08941f18e91d3 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 cc020b8a30776a6e7b76823f4402b1aa221c6961..567217933fb27f5e519326444d21eb14d7a8f864 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 15d4269501e2815fae0b48434b8c0df9f2545603..1bb6974eb03ccf0460c46210dda635f8ec45a34f 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 8589ecc7df3ce24aeab612d96f37ff0622d1c09b..dac8f193001de334cd0e19e2838176a86f26721c 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 1bdb49765d76127e40bfd69b7b26c74713cd8a0c..1e71d33445cb22026ab772cd914f3911a34f7c35 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 974495bb66e093501903658e85111343b57f69c1..a193423783563ead129785941da806efdfedff3c 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 865d3f70b748f2de57812062265cf47caf88356b..e6d6f66a0d0442ef426980cf355006af81698fd6 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 c2ed3fedb06d466d0b6e77fe743b81c975c92508..ed9006bb25eb493e2af8b5bfdb2dde217c5d0e70 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 954f82564fb9a5e17a8ee49924987c3c45e22a00..03031c1580ac20a1ea3765190e4a58feda89c88a 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 caa367e5d708ac96ef0f047a7fb3f1fdeac299c0..a8a893e217700750b4364106ba7fd6065ac3ae8f 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 ec1fd089b1abd6cfeaf7fae56bf9d7546e975b0e..372f7357b4057a95d63cba482b826d87b23a441d 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 ff5eaa59a41e187b7a29f4f6939a4f042b7d8806..8c6c0eaac6f4283f231ff11fc4438e22f523801f 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 89b4f26cfb850dcbaefcbb1321d60085d075aa34..bb204a4b54b7742c77cf503b5f9349f4607fb76d 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 398dcddcb2d57477aba32c0c62af146c9fc592d2..c06b90ec2d98434d3940cb075b235baffb7451a2 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 85551aa2b36dd1168ab19c5fe93ff238284b418f..68714da33867d5f8eb8ba433b997ed5058118b0d 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 2b4be7e917f32fb71bd0b9f1a375399af03344c2..2ffb1c1ec8dfa60403d672d524f5239af73da64f 100644 (file)
@@ -2,7 +2,7 @@
 
 #include "../g_world.qh"
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 
 void WeaponStats_Init()
 {
index f3851f5e37d455c2f403eace0f78fdf46b1e5959..1e42121529f8940c4102dfb31f7e8b8b37b3f63e 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 5998184bff9172842524fc73122616d0005f2ca1..9a3ba10987b05622ad8873ee16783475a9f09b98 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 e40fb392a86265091052077549fcc7e61d3cb122..7f86db1ee1347eac6874bbd4db5ef924dc6edca3 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)"