From: TimePath Date: Sat, 20 Aug 2016 14:46:22 +0000 (+1000) Subject: Remove _all indirection X-Git-Tag: xonotic-v0.8.2~688^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79eebf87e68861e205a8754d6551bd0aa2229c44;p=xonotic%2Fxonotic-data.pk3dir.git Remove _all indirection --- diff --git a/qcsrc/client/_all.inc b/qcsrc/client/_all.inc index 0c401acb0..f592f8adb 100644 --- a/qcsrc/client/_all.inc +++ b/qcsrc/client/_all.inc @@ -1,10 +1,10 @@ #include #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 #include diff --git a/qcsrc/client/commands/_all.inc b/qcsrc/client/commands/_all.inc deleted file mode 100644 index c90682d48..000000000 --- a/qcsrc/client/commands/_all.inc +++ /dev/null @@ -1,4 +0,0 @@ -#include -#include "_mod.inc" - -#include diff --git a/qcsrc/client/commands/_all.qh b/qcsrc/client/commands/_all.qh deleted file mode 100644 index 9b89bcdc1..000000000 --- a/qcsrc/client/commands/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 4c8e91590..631090cc1 100644 --- a/qcsrc/client/commands/cl_cmd.qc +++ b/qcsrc/client/commands/cl_cmd.qc @@ -4,12 +4,12 @@ // Last updated: December 28th, 2011 // ============================================== -#include +#include #include "cl_cmd.qh" #include "../autocvars.qh" #include "../defs.qh" -#include +#include #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 index 9988f9a22..000000000 --- a/qcsrc/client/hud/_all.inc +++ /dev/null @@ -1,4 +0,0 @@ -#include -#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 index 4ace83e64..000000000 --- a/qcsrc/client/hud/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include "panel/_all.qh" diff --git a/qcsrc/client/hud/_mod.inc b/qcsrc/client/hud/_mod.inc index f400d5d00..aa785a9e9 100644 --- a/qcsrc/client/hud/_mod.inc +++ b/qcsrc/client/hud/_mod.inc @@ -2,3 +2,5 @@ #include #include #include + +#include diff --git a/qcsrc/client/hud/_mod.qh b/qcsrc/client/hud/_mod.qh index 0ac725130..2d4850d52 100644 --- a/qcsrc/client/hud/_mod.qh +++ b/qcsrc/client/hud/_mod.qh @@ -2,3 +2,5 @@ #include #include #include + +#include diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 760f5d438..8b23dd6fb 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -7,7 +7,7 @@ #include "../teamradar.qh" #include #include -#include +#include #include #include #include diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index a895af360..0dc89a8b4 100644 --- a/qcsrc/client/hud/hud.qh +++ b/qcsrc/client/hud/hud.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include 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 index 8bc63f720..000000000 --- a/qcsrc/client/hud/panel/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/client/hud/panel/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/client/hud/panel/powerups.qc b/qcsrc/client/hud/panel/powerups.qc index 223bf72ce..7f8703f5b 100644 --- a/qcsrc/client/hud/panel/powerups.qc +++ b/qcsrc/client/hud/panel/powerups.qc @@ -1,6 +1,6 @@ #include "powerups.qh" -#include +#include // Powerups (#2) diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index 1ceab88e9..22a9827ac 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -2,7 +2,7 @@ // QuickMenu (#23) #include -#include +#include #include // QUICKMENU_MAXLINES must be <= 10 diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index b23a77053..d49548084 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,7 +1,7 @@ #include "main.qh" #include -#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 -#include +#include #include #include #include diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh index afd0b5e38..49167845d 100644 --- a/qcsrc/client/main.qh +++ b/qcsrc/client/main.qh @@ -1,7 +1,7 @@ #pragma once #include -#include +#include // -------------------------------------------------------------------------- // MENU Functionality diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index c397c882c..89f540778 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -1,6 +1,6 @@ #include "mapvoting.qh" -#include "hud/_all.qh" +#include "hud/_mod.qh" #include "hud/panel/scoreboard.qh" #include diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 9b9833286..33fd015cc 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -1,8 +1,8 @@ #include "miscfunctions.qh" -#include "hud/_all.qh" +#include "hud/_mod.qh" -#include +#include #include diff --git a/qcsrc/client/mutators/_all.inc b/qcsrc/client/mutators/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/client/mutators/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/client/mutators/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index cd08bf188..7341a01d9 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -4,7 +4,7 @@ #include "_all.inc" #endif -#include +#include #if BUILD_MOD #include "../../mod/client/progs.inc" diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 9797abfb1..75ef40521 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -1,6 +1,6 @@ #include "shownames.qh" -#include "hud/_all.qh" +#include "hud/_mod.qh" #include #include diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 84fba6ca6..9c4544bba 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -1,6 +1,6 @@ #include "teamradar.qh" -#include "hud/_all.qh" +#include "hud/_mod.qh" #include diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 86b2db13f..336707d3c 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1,7 +1,7 @@ #include "view.qh" #include "announcer.qh" -#include "hud/_all.qh" +#include "hud/_mod.qh" #include "mapvoting.qh" #include "shownames.qh" #include "hud/panel/scoreboard.qh" @@ -15,14 +15,14 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/qcsrc/client/weapons/_all.inc b/qcsrc/client/weapons/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/client/weapons/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/client/weapons/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc index ef1e03e19..7b284dc1d 100644 --- a/qcsrc/common/_all.inc +++ b/qcsrc/common/_all.inc @@ -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 index 8bc63f720..000000000 --- a/qcsrc/common/command/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/common/command/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 569332918..2fcdf0c35 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -1,4 +1,4 @@ -#include "_all.qh" +#include "_mod.qh" #include "reg.qh" #include "markup.qh" @@ -15,7 +15,7 @@ #endif #ifdef SVQC - #include + #include #include #include #endif diff --git a/qcsrc/common/effects/_mod.inc b/qcsrc/common/effects/_mod.inc index 6975259c1..d5dab8cad 100644 --- a/qcsrc/common/effects/_mod.inc +++ b/qcsrc/common/effects/_mod.inc @@ -1,3 +1,5 @@ // generated file; do not modify #include #include + +#include diff --git a/qcsrc/common/effects/_mod.qh b/qcsrc/common/effects/_mod.qh index 3f5ed8219..8d6e8ed18 100644 --- a/qcsrc/common/effects/_mod.qh +++ b/qcsrc/common/effects/_mod.qh @@ -1,3 +1,5 @@ // generated file; do not modify #include #include + +#include diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc index d17502e81..b72f38e08 100644 --- a/qcsrc/common/effects/qc/damageeffects.qc +++ b/qcsrc/common/effects/qc/damageeffects.qc @@ -6,7 +6,7 @@ #include #include #include -#include +#include #endif #endif diff --git a/qcsrc/common/gamemodes/_all.inc b/qcsrc/common/gamemodes/_all.inc deleted file mode 100644 index 21f512ae2..000000000 --- a/qcsrc/common/gamemodes/_all.inc +++ /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 index 8aed6ca80..000000000 --- a/qcsrc/common/gamemodes/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include "gamemode/_all.qh" diff --git a/qcsrc/common/gamemodes/_mod.inc b/qcsrc/common/gamemodes/_mod.inc index 98fb4815c..c3cec69dc 100644 --- a/qcsrc/common/gamemodes/_mod.inc +++ b/qcsrc/common/gamemodes/_mod.inc @@ -1 +1,3 @@ // generated file; do not modify + +#include diff --git a/qcsrc/common/gamemodes/_mod.qh b/qcsrc/common/gamemodes/_mod.qh index 98fb4815c..685c277b4 100644 --- a/qcsrc/common/gamemodes/_mod.qh +++ b/qcsrc/common/gamemodes/_mod.qh @@ -1 +1,3 @@ // generated file; do not modify + +#include diff --git a/qcsrc/common/gamemodes/gamemode/_all.inc b/qcsrc/common/gamemodes/gamemode/_all.inc deleted file mode 100644 index 7c51f951b..000000000 --- a/qcsrc/common/gamemodes/gamemode/_all.inc +++ /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 index dd16f04dd..000000000 --- a/qcsrc/common/gamemodes/gamemode/_all.qh +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include "nexball/_mod.qh" -#include "onslaught/_mod.qh" diff --git a/qcsrc/common/gamemodes/gamemode/_mod.inc b/qcsrc/common/gamemodes/gamemode/_mod.inc index 98fb4815c..2fc2c4046 100644 --- a/qcsrc/common/gamemodes/gamemode/_mod.inc +++ b/qcsrc/common/gamemodes/gamemode/_mod.inc @@ -1 +1,4 @@ // generated file; do not modify + +#include +#include diff --git a/qcsrc/common/gamemodes/gamemode/_mod.qh b/qcsrc/common/gamemodes/gamemode/_mod.qh index 98fb4815c..d79957012 100644 --- a/qcsrc/common/gamemodes/gamemode/_mod.qh +++ b/qcsrc/common/gamemodes/gamemode/_mod.qh @@ -1 +1,4 @@ // generated file; do not modify + +#include +#include diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh index c8f94c9d8..f70ba3c55 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh @@ -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 index 8bc63f720..000000000 --- a/qcsrc/common/items/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/common/items/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/common/items/_mod.inc b/qcsrc/common/items/_mod.inc index 3b5dd9550..6214fac04 100644 --- a/qcsrc/common/items/_mod.inc +++ b/qcsrc/common/items/_mod.inc @@ -1,2 +1,4 @@ // generated file; do not modify #include + +#include diff --git a/qcsrc/common/items/_mod.qh b/qcsrc/common/items/_mod.qh index 158814c55..a04e90b1d 100644 --- a/qcsrc/common/items/_mod.qh +++ b/qcsrc/common/items/_mod.qh @@ -1,2 +1,4 @@ // generated file; do not modify #include + +#include diff --git a/qcsrc/common/items/all.qc b/qcsrc/common/items/all.qc index ab77f3071..7782cda0d 100644 --- a/qcsrc/common/items/all.qc +++ b/qcsrc/common/items/all.qc @@ -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 diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh index 73bd502c8..41cd42498 100644 --- a/qcsrc/common/items/all.qh +++ b/qcsrc/common/items/all.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "item.qh" diff --git a/qcsrc/common/items/item/_all.inc b/qcsrc/common/items/item/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/common/items/item/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/common/items/item/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/common/items/item/ammo.qc b/qcsrc/common/items/item/ammo.qc index 525a5b3d9..d7e0dcc68 100644 --- a/qcsrc/common/items/item/ammo.qc +++ b/qcsrc/common/items/item/ammo.qc @@ -1,84 +1 @@ #include "ammo.qh" -#ifdef SVQC - #include -#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 -} diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh index 56c936919..d2ef10a4f 100644 --- a/qcsrc/common/items/item/ammo.qh +++ b/qcsrc/common/items/item/ammo.qh @@ -8,3 +8,87 @@ CLASS(Ammo, Pickup) ATTRIB(Ammo, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_ammo)); #endif ENDCLASS(Ammo) + +#ifdef SVQC + #include +#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 +} diff --git a/qcsrc/common/items/item/armor.qc b/qcsrc/common/items/item/armor.qc index f8669e0e0..cca0b5418 100644 --- a/qcsrc/common/items/item/armor.qc +++ b/qcsrc/common/items/item/armor.qc @@ -1,89 +1 @@ #include "armor.qh" -#ifdef SVQC - #include -#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 -} diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh index 9078b636d..cb41abc29 100644 --- a/qcsrc/common/items/item/armor.qh +++ b/qcsrc/common/items/item/armor.qh @@ -8,3 +8,92 @@ CLASS(Armor, Pickup) ATTRIB(Armor, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc); #endif ENDCLASS(Armor) + +#ifdef SVQC + #include +#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 +} diff --git a/qcsrc/common/items/item/health.qc b/qcsrc/common/items/item/health.qc index 93ba2f36e..49a34c1c8 100644 --- a/qcsrc/common/items/item/health.qc +++ b/qcsrc/common/items/item/health.qc @@ -1,89 +1 @@ #include "health.qh" -#ifdef SVQC - #include -#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 -} diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh index 8eb463a8f..79933870f 100644 --- a/qcsrc/common/items/item/health.qh +++ b/qcsrc/common/items/item/health.qh @@ -8,3 +8,92 @@ CLASS(Health, Pickup) ATTRIB(Health, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc); #endif ENDCLASS(Health) + +#ifdef SVQC + #include +#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 +} diff --git a/qcsrc/common/items/item/jetpack.qc b/qcsrc/common/items/item/jetpack.qc index 7fd29e299..ec09d5c45 100644 --- a/qcsrc/common/items/item/jetpack.qc +++ b/qcsrc/common/items/item/jetpack.qc @@ -1,66 +1 @@ -#ifdef SVQC - #include -#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" diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh index 6f70f09be..67f308c2a 100644 --- a/qcsrc/common/items/item/jetpack.qh +++ b/qcsrc/common/items/item/jetpack.qh @@ -1 +1,68 @@ #pragma once + +#ifdef SVQC + #include +#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 +} diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh index 136c8dab6..5bd5da774 100644 --- a/qcsrc/common/items/item/pickup.qh +++ b/qcsrc/common/items/item/pickup.qh @@ -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 #include +#include + 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()); diff --git a/qcsrc/common/items/item/powerup.qc b/qcsrc/common/items/item/powerup.qc index 375f958a1..7c7405b75 100644 --- a/qcsrc/common/items/item/powerup.qc +++ b/qcsrc/common/items/item/powerup.qc @@ -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; -} diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh index ca17c970b..f0745b6c2 100644 --- a/qcsrc/common/items/item/powerup.qh +++ b/qcsrc/common/items/item/powerup.qh @@ -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; +} diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 2bc84c459..9ef75a6b2 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1,7 +1,7 @@ #if defined(CSQC) #include "../client/defs.qh" #include "util.qh" - #include + #include #include "mapinfo.qh" #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/minigames/_mod.inc b/qcsrc/common/minigames/_mod.inc index 66693ef2a..4171f475c 100644 --- a/qcsrc/common/minigames/_mod.inc +++ b/qcsrc/common/minigames/_mod.inc @@ -9,3 +9,5 @@ #ifdef SVQC #include #endif + +#include diff --git a/qcsrc/common/minigames/_mod.qh b/qcsrc/common/minigames/_mod.qh index 9c3376003..e0daf8f67 100644 --- a/qcsrc/common/minigames/_mod.qh +++ b/qcsrc/common/minigames/_mod.qh @@ -9,3 +9,5 @@ #ifdef SVQC #include #endif + +#include diff --git a/qcsrc/common/monsters/_all.inc b/qcsrc/common/monsters/_all.inc new file mode 100644 index 000000000..8bc63f720 --- /dev/null +++ b/qcsrc/common/monsters/_all.inc @@ -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 index 000000000..947026dd5 --- /dev/null +++ b/qcsrc/common/monsters/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/monsters/all.qc b/qcsrc/common/monsters/all.qc index 3abacacca..fa3f65193 100644 --- a/qcsrc/common/monsters/all.qc +++ b/qcsrc/common/monsters/all.qc @@ -15,7 +15,7 @@ string M_Model(string m_mdl) #include "all.qh" #define IMPLEMENTATION -#include "monster/_all.inc" +#include "monster/_mod.inc" #undef IMPLEMENTATION #ifdef SVQC diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh index d49489f13..84f7a0d78 100644 --- a/qcsrc/common/monsters/all.qh +++ b/qcsrc/common/monsters/all.qh @@ -16,4 +16,4 @@ const int MON_FIRST = 1; REGISTER_MONSTER(Null, NEW(Monster)); -#include "monster/_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 index 8bc63f720..000000000 --- a/qcsrc/common/monsters/monster/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/common/monsters/monster/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index 509fa0aca..e23f77a4d 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -22,8 +22,8 @@ REGISTER_MONSTER(MAGE, NEW(Mage)) { #endif } -#include -#include +#include +#include CLASS(MageSpike, PortoLaunch) /* flags */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED); diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index 9fa73508c..ad7fb9ff3 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -22,7 +22,7 @@ REGISTER_MONSTER(SPIDER, NEW(Spider)) { #endif } -#include +#include CLASS(SpiderAttack, PortoLaunch) /* flags */ ATTRIB(SpiderAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED); diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index 33a3c4459..eab14131d 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -22,7 +22,7 @@ REGISTER_MONSTER(WYVERN, NEW(Wyvern)) { #endif } -#include +#include CLASS(WyvernAttack, PortoLaunch) /* flags */ ATTRIB(WyvernAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED); diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index beca5ebbd..9a45e856a 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -1,28 +1,27 @@ -#if defined(CSQC) -#elif defined(MENUQC) -#elif defined(SVQC) - #include - #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 - #include - #include "../deathtypes/all.qh" - #include - #include - #include "../turrets/sv_turrets.qh" - #include "../turrets/util.qh" - #include "../vehicles/all.qh" - #include - #include - #include "../triggers/triggers.qh" - #include - #include -#endif +#include "sv_monsters.qh" + +#include +#include +#include "../constants.qh" +#include "../teams.qh" +#include "../util.qh" +#include "all.qh" +#include "../physics/movelib.qh" +#include "../weapons/_mod.qh" +#include +#include +#include "../deathtypes/all.qh" +#include +#include +#include "../turrets/sv_turrets.qh" +#include "../turrets/util.qh" +#include "../vehicles/all.qh" +#include +#include +#include "../triggers/triggers.qh" +#include +#include +#include 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 index 65d709243..000000000 --- a/qcsrc/common/mutators/_all.inc +++ /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 index bae58a55c..000000000 --- a/qcsrc/common/mutators/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include "mutator/_all.qh" diff --git a/qcsrc/common/mutators/_mod.inc b/qcsrc/common/mutators/_mod.inc index 98fb4815c..29d6deabb 100644 --- a/qcsrc/common/mutators/_mod.inc +++ b/qcsrc/common/mutators/_mod.inc @@ -1 +1,3 @@ // generated file; do not modify + +#include diff --git a/qcsrc/common/mutators/_mod.qh b/qcsrc/common/mutators/_mod.qh index 98fb4815c..b19e9c4d7 100644 --- a/qcsrc/common/mutators/_mod.qh +++ b/qcsrc/common/mutators/_mod.qh @@ -1 +1,3 @@ // generated file; do not modify + +#include diff --git a/qcsrc/common/mutators/mutator/_all.inc b/qcsrc/common/mutators/mutator/_all.inc deleted file mode 100644 index 9b557a22b..000000000 --- a/qcsrc/common/mutators/mutator/_all.inc +++ /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 index b49167e7e..000000000 --- a/qcsrc/common/mutators/mutator/_all.qh +++ /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" - diff --git a/qcsrc/common/mutators/mutator/_mod.inc b/qcsrc/common/mutators/mutator/_mod.inc index 98fb4815c..294047d50 100644 --- a/qcsrc/common/mutators/mutator/_mod.inc +++ b/qcsrc/common/mutators/mutator/_mod.inc @@ -1 +1,37 @@ // generated file; do not modify + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/qcsrc/common/mutators/mutator/_mod.qh b/qcsrc/common/mutators/mutator/_mod.qh index 98fb4815c..de43630be 100644 --- a/qcsrc/common/mutators/mutator/_mod.qh +++ b/qcsrc/common/mutators/mutator/_mod.qh @@ -1 +1,37 @@ // generated file; do not modify + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh index 89c550f7a..2b4291ff3 100644 --- a/qcsrc/common/mutators/mutator/buffs/buffs.qh +++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh @@ -3,8 +3,10 @@ #include #include +#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) diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc index 0ea6b057a..d9223b302 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc @@ -1,7 +1,7 @@ #include "sv_buffs.qh" #include -#include +#include .float buff_time = _STAT(BUFF_TIME); void buffs_DelayedInit(entity this); diff --git a/qcsrc/common/mutators/mutator/instagib/items.qh b/qcsrc/common/mutators/mutator/instagib/items.qh index 269ec2d24..65decbf40 100644 --- a/qcsrc/common/mutators/mutator/instagib/items.qh +++ b/qcsrc/common/mutators/mutator/instagib/items.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc index 6176ebbab..0cf3ed978 100644 --- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc +++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc @@ -6,7 +6,7 @@ float autocvar_g_instagib_speed_highspeed; #include -#include +#include REGISTER_MUTATOR(mutator_instagib, cvar("g_instagib") && !g_nexball); diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index b8d100786..d907864ef 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -145,7 +145,7 @@ void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expan #ifdef SVQC -#include +#include #include #include #include diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index 6d5ac8086..ea7ed953c 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -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; diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh index 26e4058d2..6a420b734 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh @@ -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 diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index 49d2c57b7..5d8e9341c 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -8,7 +8,7 @@ #include #include #include "all.qh" - #include + #include #endif // ================================================ diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index e66ea3f0a..1fd7f108f 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/qcsrc/common/physics/_mod.inc b/qcsrc/common/physics/_mod.inc index 3a61cd4e9..100aecae2 100644 --- a/qcsrc/common/physics/_mod.inc +++ b/qcsrc/common/physics/_mod.inc @@ -1,3 +1,5 @@ // generated file; do not modify #include #include + +#include diff --git a/qcsrc/common/physics/_mod.qh b/qcsrc/common/physics/_mod.qh index 39dacad8e..377a7b340 100644 --- a/qcsrc/common/physics/_mod.qh +++ b/qcsrc/common/physics/_mod.qh @@ -1,3 +1,5 @@ // generated file; do not modify #include #include + +#include diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index ad5822126..56ffccea7 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -3,7 +3,7 @@ #elif defined(SVQC) #include "constants.qh" #include "util.qh" - #include + #include #include "../server/weapons/accuracy.qh" #include "../server/defs.qh" #include "playerstats.qh" diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 32e718ae2..ebc971141 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -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 + #include #include "../server/weapons/common.qh" #include "../server/weapons/selection.qh" @@ -20,12 +20,12 @@ #include - #include + #include #include "../lib/warpzone/util_server.qh" #elif defined(CSQC) #include "physics/movetypes/movetypes.qh" - #include + #include #include "../lib/csqcmodel/cl_model.qh" #include "../lib/csqcmodel/common.qh" #endif diff --git a/qcsrc/common/triggers/_mod.inc b/qcsrc/common/triggers/_mod.inc index c049b1082..9b327de55 100644 --- a/qcsrc/common/triggers/_mod.inc +++ b/qcsrc/common/triggers/_mod.inc @@ -4,3 +4,8 @@ #include #include #include + +#include +#include +#include +#include diff --git a/qcsrc/common/triggers/_mod.qh b/qcsrc/common/triggers/_mod.qh index 2fba60461..d3bb2dc3a 100644 --- a/qcsrc/common/triggers/_mod.qh +++ b/qcsrc/common/triggers/_mod.qh @@ -4,3 +4,8 @@ #include #include #include + +#include +#include +#include +#include diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc index 99eb846c7..e204d3a25 100644 --- a/qcsrc/common/triggers/trigger/swamp.qc +++ b/qcsrc/common/triggers/trigger/swamp.qc @@ -2,7 +2,7 @@ #elif defined(MENUQC) #elif defined(SVQC) #include - #include + #include #include #include #endif diff --git a/qcsrc/common/turrets/_all.inc b/qcsrc/common/turrets/_all.inc new file mode 100644 index 000000000..8bc63f720 --- /dev/null +++ b/qcsrc/common/turrets/_all.inc @@ -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 index 000000000..947026dd5 --- /dev/null +++ b/qcsrc/common/turrets/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/turrets/all.qc b/qcsrc/common/turrets/all.qc index ec62c248c..469a64c92 100644 --- a/qcsrc/common/turrets/all.qc +++ b/qcsrc/common/turrets/all.qc @@ -7,7 +7,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_TURRET) #endif #define IMPLEMENTATION -#include "turret/_all.inc" +#include "turret/_mod.inc" #undef IMPLEMENTATION #ifdef CSQC diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index cbb0379f0..1a77e9891 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #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" diff --git a/qcsrc/common/turrets/turret.qh b/qcsrc/common/turrets/turret.qh index 649fd51ae..8e5239702 100644 --- a/qcsrc/common/turrets/turret.qh +++ b/qcsrc/common/turrets/turret.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include 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 index 8bc63f720..000000000 --- a/qcsrc/common/turrets/turret/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/common/turrets/turret/_all.qh +++ /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 index 000000000..8bc63f720 --- /dev/null +++ b/qcsrc/common/vehicles/_all.inc @@ -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 index 000000000..947026dd5 --- /dev/null +++ b/qcsrc/common/vehicles/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/vehicles/all.qc b/qcsrc/common/vehicles/all.qc index 5a14b647d..251df2283 100644 --- a/qcsrc/common/vehicles/all.qc +++ b/qcsrc/common/vehicles/all.qc @@ -12,7 +12,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR) #endif #define IMPLEMENTATION -#include "vehicle/_all.inc" +#include "vehicle/_mod.inc" #undef IMPLEMENTATION #endif diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh index 779076a74..158492f66 100644 --- a/qcsrc/common/vehicles/all.qh +++ b/qcsrc/common/vehicles/all.qh @@ -20,4 +20,4 @@ const int VEH_FIRST = 1; REGISTER_VEHICLE(Null, NEW(Vehicle)); -#include "vehicle/_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 index 8bc63f720..000000000 --- a/qcsrc/common/vehicles/vehicle/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/common/vehicles/vehicle/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qh b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qh index 73fed55e1..d4ed9505b 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qh +++ b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include float autocvar_g_vehicle_bumblebee_cannon_cost = 2; float autocvar_g_vehicle_bumblebee_cannon_damage = 60; diff --git a/qcsrc/common/vehicles/vehicle/racer_weapon.qh b/qcsrc/common/vehicles/vehicle/racer_weapon.qh index fc9e35254..51c20ef9d 100644 --- a/qcsrc/common/vehicles/vehicle/racer_weapon.qh +++ b/qcsrc/common/vehicles/vehicle/racer_weapon.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include CLASS(RacerAttack, PortoLaunch) /* flags */ ATTRIB(RacerAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED); diff --git a/qcsrc/common/vehicles/vehicle/raptor_weapons.qh b/qcsrc/common/vehicles/vehicle/raptor_weapons.qh index 0b3af4169..4260d4292 100644 --- a/qcsrc/common/vehicles/vehicle/raptor_weapons.qh +++ b/qcsrc/common/vehicles/vehicle/raptor_weapons.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include CLASS(RaptorCannon, PortoLaunch) /* flags */ ATTRIB(RaptorCannon, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED); diff --git a/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qh b/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qh index 61e2b0250..a1523045a 100644 --- a/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qh +++ b/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #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 index 000000000..213c39c62 --- /dev/null +++ b/qcsrc/common/weapons/_all.inc @@ -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 index 000000000..671dde06d --- /dev/null +++ b/qcsrc/common/weapons/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "all.qh" diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 81790e6c0..654750786 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -19,6 +19,7 @@ #include #elif defined(MENUQC) #elif defined(SVQC) + #include #include #include #include @@ -37,9 +38,9 @@ #include #include "../notifications/all.qh" #include "../deathtypes/all.qh" - #include + #include #include "../mapinfo.qh" - #include + #include #include #include #include diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 113ae8306..28fbd9c3c 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include "config.qh" diff --git a/qcsrc/common/weapons/calculations.qc b/qcsrc/common/weapons/calculations.qc index 73d9b938e..c35b1930c 100644 --- a/qcsrc/common/weapons/calculations.qc +++ b/qcsrc/common/weapons/calculations.qc @@ -1,3 +1,5 @@ +#include "calculations.qh" + // ============================= // Explosion Force Calculation // ============================= diff --git a/qcsrc/common/weapons/calculations.qh b/qcsrc/common/weapons/calculations.qh index 05eb9d9ba..c349eeca4 100644 --- a/qcsrc/common/weapons/calculations.qh +++ b/qcsrc/common/weapons/calculations.qh @@ -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); diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index a08be2e61..c525bb81b 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -130,7 +130,7 @@ CLASS(Weapon, Object) } ENDCLASS(Weapon) -#include +#include 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 index 726f693e9..000000000 --- a/qcsrc/ecs/_lib.inc +++ /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 index a617c73b0..000000000 --- a/qcsrc/ecs/_lib.qh +++ /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 diff --git a/qcsrc/ecs/_mod.inc b/qcsrc/ecs/_mod.inc index 683c3a91d..48b7069b2 100644 --- a/qcsrc/ecs/_mod.inc +++ b/qcsrc/ecs/_mod.inc @@ -1,2 +1,6 @@ // generated file; do not modify #include + +#include +#include +#include diff --git a/qcsrc/ecs/_mod.qh b/qcsrc/ecs/_mod.qh index 4d8bc34da..0d1ff4482 100644 --- a/qcsrc/ecs/_mod.qh +++ b/qcsrc/ecs/_mod.qh @@ -1,2 +1,6 @@ // generated file; do not modify #include + +#include +#include +#include diff --git a/qcsrc/ecs/lib.qh b/qcsrc/ecs/lib.qh new file mode 100644 index 000000000..a617c73b0 --- /dev/null +++ b/qcsrc/ecs/lib.qh @@ -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 diff --git a/qcsrc/ecs/main.qh b/qcsrc/ecs/main.qh index 9b7bf3523..724cb1ef8 100644 --- a/qcsrc/ecs/main.qh +++ b/qcsrc/ecs/main.qh @@ -1,3 +1,5 @@ #pragma once +#include "lib.qh" + void systems_update(); diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc index cdacdc64c..a5204fa05 100644 --- a/qcsrc/lib/_all.inc +++ b/qcsrc/lib/_all.inc @@ -122,7 +122,7 @@ void isnt_bool(float this) { print(ftos(this)); } #include "vector.qh" #include "yenc.qh" -#include "matrix/_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 - #include + #include #endif diff --git a/qcsrc/lib/matrix/_all.inc b/qcsrc/lib/matrix/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/lib/matrix/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/lib/matrix/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc index cff5be758..90e3cd76c 100644 --- a/qcsrc/lib/warpzone/common.qc +++ b/qcsrc/lib/warpzone/common.qc @@ -4,7 +4,7 @@ #include #elif defined(MENUQC) #elif defined(SVQC) - #include + #include #endif void WarpZone_Accumulator_Clear(entity acc) diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index bff219702..34ea2610d 100644 --- a/qcsrc/lib/warpzone/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -7,7 +7,7 @@ #include #include #include - #include + #include #include #include #endif diff --git a/qcsrc/menu/_all.inc b/qcsrc/menu/_all.inc index bebbdcc19..e5198f591 100644 --- a/qcsrc/menu/_all.inc +++ b/qcsrc/menu/_all.inc @@ -1,10 +1,10 @@ #include #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 diff --git a/qcsrc/menu/anim/_all.inc b/qcsrc/menu/anim/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/menu/anim/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/menu/anim/_all.qh +++ /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 index 2e1b0ab9e..000000000 --- a/qcsrc/menu/command/_all.inc +++ /dev/null @@ -1,4 +0,0 @@ -#include "_all.qh" -#include "_mod.inc" - -#include diff --git a/qcsrc/menu/command/_all.qh b/qcsrc/menu/command/_all.qh deleted file mode 100644 index 9b89bcdc1..000000000 --- a/qcsrc/menu/command/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index fb0ac1799..72aadf624 100644 --- a/qcsrc/menu/command/menu_cmd.qc +++ b/qcsrc/menu/command/menu_cmd.qc @@ -5,7 +5,7 @@ #include "../mutators/events.qh" -#include +#include .entity firstChild, nextSibling; diff --git a/qcsrc/menu/item/_all.inc b/qcsrc/menu/item/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/menu/item/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/menu/item/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index 22934ca90..aaa33b137 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -17,8 +17,8 @@ #include "xonotic/util.qh" -#include "../common/items/all.qh" -#include +#include "../common/items/_mod.qh" +#include #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 index 8bc63f720..000000000 --- a/qcsrc/menu/mutators/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/menu/mutators/_all.qh +++ /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 index 8bc63f720..000000000 --- a/qcsrc/menu/xonotic/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/menu/xonotic/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index f2f7f5c8e..07fe09c10 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc @@ -1,5 +1,5 @@ #include "dialog_multiplayer_create_mutators.qh" -#include +#include #include "weaponarenacheckbox.qh" #include "checkbox.qh" diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc index 27e488164..2d093a2ed 100644 --- a/qcsrc/menu/xonotic/keybinder.qc +++ b/qcsrc/menu/xonotic/keybinder.qc @@ -1,6 +1,6 @@ #include "keybinder.qh" -#include +#include .int flags; #include "button.qh" diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index 3ad575448..ec76d389e 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -7,7 +7,7 @@ #include #include #include -#include +#include float GL_CheckExtension(string ext) { diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc index ed74631de..7b3d7375b 100644 --- a/qcsrc/menu/xonotic/weaponslist.qc +++ b/qcsrc/menu/xonotic/weaponslist.qc @@ -1,6 +1,6 @@ #include "weaponslist.qh" -#include +#include .bool disabled; diff --git a/qcsrc/server/_all.inc b/qcsrc/server/_all.inc index d2d15bb92..3359f13b1 100644 --- a/qcsrc/server/_all.inc +++ b/qcsrc/server/_all.inc @@ -1,11 +1,11 @@ #include #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 #include diff --git a/qcsrc/server/bot/_all.inc b/qcsrc/server/bot/_all.inc deleted file mode 100644 index ae3f973b0..000000000 --- a/qcsrc/server/bot/_all.inc +++ /dev/null @@ -1,4 +0,0 @@ -#include -#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 index 1d31636a8..000000000 --- a/qcsrc/server/bot/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include "default/_all.qh" diff --git a/qcsrc/server/bot/_mod.inc b/qcsrc/server/bot/_mod.inc index 8f0672e26..7c0c2882e 100644 --- a/qcsrc/server/bot/_mod.inc +++ b/qcsrc/server/bot/_mod.inc @@ -1,2 +1,5 @@ // generated file; do not modify #include + +#include +#include diff --git a/qcsrc/server/bot/_mod.qh b/qcsrc/server/bot/_mod.qh index 33f0b0229..3678fc69f 100644 --- a/qcsrc/server/bot/_mod.qh +++ b/qcsrc/server/bot/_mod.qh @@ -1,2 +1,5 @@ // generated file; do not modify #include + +#include +#include diff --git a/qcsrc/server/bot/api.qh b/qcsrc/server/bot/api.qh index 9c525892f..59af78cb0 100644 --- a/qcsrc/server/bot/api.qh +++ b/qcsrc/server/bot/api.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include 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 index f856187bb..000000000 --- a/qcsrc/server/bot/default/_all.inc +++ /dev/null @@ -1,4 +0,0 @@ -#include -#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 index 43706ce24..000000000 --- a/qcsrc/server/bot/default/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include "havocbot/_all.qh" diff --git a/qcsrc/server/bot/default/_mod.inc b/qcsrc/server/bot/default/_mod.inc index ec73502c3..03fb7e0f5 100644 --- a/qcsrc/server/bot/default/_mod.inc +++ b/qcsrc/server/bot/default/_mod.inc @@ -5,3 +5,5 @@ #include #include #include + +#include diff --git a/qcsrc/server/bot/default/_mod.qh b/qcsrc/server/bot/default/_mod.qh index 9252f195e..04896279b 100644 --- a/qcsrc/server/bot/default/_mod.qh +++ b/qcsrc/server/bot/default/_mod.qh @@ -5,3 +5,5 @@ #include #include #include + +#include diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc index df874e3eb..1624676b8 100644 --- a/qcsrc/server/bot/default/aim.qc +++ b/qcsrc/server/bot/default/aim.qc @@ -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, diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index 7b742e5aa..502e2532c 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -21,7 +21,7 @@ #include "../../race.qh" #include -#include "../../mutators/_all.qh" +#include "../../mutators/_mod.qh" #include "../../weapons/accuracy.qh" @@ -31,7 +31,9 @@ #include #include -#include +#include + +#include #include diff --git a/qcsrc/server/bot/default/havocbot/_all.inc b/qcsrc/server/bot/default/havocbot/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/server/bot/default/havocbot/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/server/bot/default/havocbot/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index 5ccc80a3a..d23c29675 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 1d18a582e..51325f4f9 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -7,7 +7,7 @@ #include -#include +#include #include #include diff --git a/qcsrc/server/bot/null/bot_null.qc b/qcsrc/server/bot/null/bot_null.qc index 75a7bcd11..271252dee 100644 --- a/qcsrc/server/bot/null/bot_null.qc +++ b/qcsrc/server/bot/null/bot_null.qc @@ -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 diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index a5858a9e0..71e0cd2e8 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -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 #include "../common/triggers/subs.qh" diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 68fa35e00..0c6f66a2c 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -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 index b90bed8cd..000000000 --- a/qcsrc/server/command/_all.inc +++ /dev/null @@ -1,4 +0,0 @@ -#include -#include "_mod.inc" - -#include diff --git a/qcsrc/server/command/_all.qh b/qcsrc/server/command/_all.qh deleted file mode 100644 index 9b89bcdc1..000000000 --- a/qcsrc/server/command/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc index 6a9b2b361..8a35bec29 100644 --- a/qcsrc/server/command/banning.qc +++ b/qcsrc/server/command/banning.qc @@ -1,5 +1,5 @@ #include "banning.qh" -#include +#include #include "banning.qh" #include "common.qh" diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 48ac3bff5..e23f9bc98 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,5 +1,5 @@ #include "cmd.qh" -#include +#include #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 diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index 8f5b619fd..357a33eba 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -1,5 +1,5 @@ #include "common.qh" -#include +#include #include "common.qh" #include "../scores.qh" diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh index 0c09006ee..7fbbddf7d 100644 --- a/qcsrc/server/command/common.qh +++ b/qcsrc/server/command/common.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include 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 -#include +#include // ============================================================ // Shared declarations for server commands, written by Samual diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc index 1274fcf5f..259872471 100644 --- a/qcsrc/server/command/getreplies.qc +++ b/qcsrc/server/command/getreplies.qc @@ -1,5 +1,5 @@ #include "getreplies.qh" -#include +#include #include "getreplies.qh" #include "../race.qh" diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc index 5f7533d7d..acf2d40ae 100644 --- a/qcsrc/server/command/radarmap.qc +++ b/qcsrc/server/command/radarmap.qc @@ -1,5 +1,5 @@ #include "radarmap.qh" -#include +#include #include "radarmap.qh" #include "../g_world.qh" diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index f0efcba46..a329ac996 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -1,5 +1,5 @@ #include "sv_cmd.qh" -#include "_all.qh" +#include "_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 #include diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index d03ed3489..361f12844 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -1,5 +1,5 @@ #include "vote.qh" -#include +#include #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 #include diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 53aa317e6..f233bb7d8 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -1,7 +1,7 @@ #pragma once float warmup_limit; -#include +#include #include #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; diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 5ec8141e0..612528a61 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -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 #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; diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh index eb6a1cba0..019c8fc9a 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -7,7 +7,7 @@ #include #include #include - #include + #include #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" @@ -17,7 +17,7 @@ #include "defs.qh" #include #include - #include "mutators/_all.qh" + #include "mutators/_mod.qh" #include #include #include diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index 168457328..46508a919 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -13,7 +13,7 @@ #include "../common/vehicles/all.qh" #include "../common/constants.qh" #include "../common/util.qh" -#include "../common/weapons/all.qh" +#include #include "../lib/warpzone/common.qh" #include "../lib/warpzone/server.qh" diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index a04d6d440..657ac07cb 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -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 #include "../common/state.qh" const float LATENCY_THINKRATE = 10; diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc index c797c5771..4660a433b 100644 --- a/qcsrc/server/impulse.qc +++ b/qcsrc/server/impulse.qc @@ -14,7 +14,7 @@ #include "../common/minigames/sv_minigames.qh" -#include "../common/weapons/all.qh" +#include #include "../common/vehicles/sv_vehicles.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index a88b4be56..530e43f4a 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -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" @@ -19,10 +19,10 @@ #include "../common/triggers/subs.qh" #include "../common/util.qh" #include "../common/turrets/sv_turrets.qh" -#include "../common/weapons/all.qh" +#include #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 index 65d709243..000000000 --- a/qcsrc/server/mutators/_all.inc +++ /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 index bae58a55c..000000000 --- a/qcsrc/server/mutators/_all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "_mod.qh" - -#include "mutator/_all.qh" diff --git a/qcsrc/server/mutators/_mod.inc b/qcsrc/server/mutators/_mod.inc index 582c2852f..f0108dec3 100644 --- a/qcsrc/server/mutators/_mod.inc +++ b/qcsrc/server/mutators/_mod.inc @@ -1,2 +1,4 @@ // generated file; do not modify #include + +#include diff --git a/qcsrc/server/mutators/_mod.qh b/qcsrc/server/mutators/_mod.qh index 9ba0319fe..9888c9466 100644 --- a/qcsrc/server/mutators/_mod.qh +++ b/qcsrc/server/mutators/_mod.qh @@ -1,2 +1,4 @@ // generated file; do not modify #include + +#include diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh index 64577fa6b..ba3e48f17 100644 --- a/qcsrc/server/mutators/gamemode.qh +++ b/qcsrc/server/mutators/gamemode.qh @@ -18,14 +18,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include @@ -79,7 +79,7 @@ #include -#include +#include #include diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh index d00a20b0f..9c13e1bb6 100644 --- a/qcsrc/server/mutators/mutator.qh +++ b/qcsrc/server/mutators/mutator.qh @@ -13,7 +13,7 @@ #include -#include +#include #include #include diff --git a/qcsrc/server/mutators/mutator/_all.inc b/qcsrc/server/mutators/mutator/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/server/mutators/mutator/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/server/mutators/mutator/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/server/mutators/mutator/gamemode_lms.qc b/qcsrc/server/mutators/mutator/gamemode_lms.qc index 0807ea445..608517fbf 100644 --- a/qcsrc/server/mutators/mutator/gamemode_lms.qc +++ b/qcsrc/server/mutators/mutator/gamemode_lms.qc @@ -2,7 +2,7 @@ #include #include -#include +#include 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 index 73539f9ee..000000000 --- a/qcsrc/server/pathlib/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/server/pathlib/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/server/pathlib/costs.qc b/qcsrc/server/pathlib/costs.qc index 6b89bb640..fdb95d2f6 100644 --- a/qcsrc/server/pathlib/costs.qc +++ b/qcsrc/server/pathlib/costs.qc @@ -1,5 +1,4 @@ #include "costs.qh" -#include "pathlib.qh" float pathlib_g_static(entity parent,vector to, float static_cost) { diff --git a/qcsrc/server/pathlib/costs.qh b/qcsrc/server/pathlib/costs.qh index 6f70f09be..811c031af 100644 --- a/qcsrc/server/pathlib/costs.qh +++ b/qcsrc/server/pathlib/costs.qh @@ -1 +1,2 @@ #pragma once +#include "pathlib.qh" diff --git a/qcsrc/server/pathlib/debug.qc b/qcsrc/server/pathlib/debug.qc index 0a350df2c..b84ae6414 100644 --- a/qcsrc/server/pathlib/debug.qc +++ b/qcsrc/server/pathlib/debug.qc @@ -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 diff --git a/qcsrc/server/pathlib/debug.qh b/qcsrc/server/pathlib/debug.qh index 6f70f09be..811c031af 100644 --- a/qcsrc/server/pathlib/debug.qh +++ b/qcsrc/server/pathlib/debug.qh @@ -1 +1,2 @@ #pragma once +#include "pathlib.qh" diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index a9d9600a7..12083e423 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -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 #include "../lib/csqcmodel/sv_model.qh" #include "../lib/warpzone/anglestransform.qh" #include "../lib/warpzone/util_server.qh" diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc index 743f981ed..93421a7e8 100644 --- a/qcsrc/server/progs.inc +++ b/qcsrc/server/progs.inc @@ -4,7 +4,7 @@ #include "_all.inc" #endif -#include +#include #if BUILD_MOD #include "../../mod/server/progs.inc" diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index f2a6265ae..94bea2b44 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -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" diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index cc020b8a3..567217933 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -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" diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 15d426950..1bb6974eb 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -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 #include "../lib/csqcmodel/sv_model.qh" diff --git a/qcsrc/server/t_quake.qc b/qcsrc/server/t_quake.qc index 8589ecc7d..dac8f1930 100644 --- a/qcsrc/server/t_quake.qc +++ b/qcsrc/server/t_quake.qc @@ -1,6 +1,6 @@ #include "t_quake.qh" -#include "../common/weapons/all.qh" +#include spawnfunc(weapon_electro); spawnfunc(weapon_hagar); diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc index 1bdb49765..1e71d3344 100644 --- a/qcsrc/server/t_quake3.qc +++ b/qcsrc/server/t_quake3.qc @@ -1,6 +1,6 @@ #include "t_quake3.qh" -#include "../common/weapons/all.qh" +#include spawnfunc(weapon_crylink); spawnfunc(weapon_electro); diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index 974495bb6..a19342378 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -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) diff --git a/qcsrc/server/tests.qh b/qcsrc/server/tests.qh index 865d3f70b..e6d6f66a0 100644 --- a/qcsrc/server/tests.qh +++ b/qcsrc/server/tests.qh @@ -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 #include -#include +#include #include diff --git a/qcsrc/server/weapons/_all.inc b/qcsrc/server/weapons/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/server/weapons/_all.inc +++ /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 index 947026dd5..000000000 --- a/qcsrc/server/weapons/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc index c2ed3fedb..ed9006bb2 100644 --- a/qcsrc/server/weapons/accuracy.qc +++ b/qcsrc/server/weapons/accuracy.qc @@ -1,10 +1,10 @@ #include "accuracy.qh" -#include "../mutators/_all.qh" +#include "../mutators/_mod.qh" #include #include #include -#include +#include int accuracy_byte(float n, float d) { diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc index 954f82564..03031c158 100644 --- a/qcsrc/server/weapons/common.qc +++ b/qcsrc/server/weapons/common.qc @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include void W_GiveWeapon(entity e, int wep) { diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc index caa367e5d..a8a893e21 100644 --- a/qcsrc/server/weapons/csqcprojectile.qc +++ b/qcsrc/server/weapons/csqcprojectile.qc @@ -5,7 +5,7 @@ #include "../command/common.qh" #include -#include +#include .float csqcprojectile_type; diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc index ec1fd089b..372f7357b 100644 --- a/qcsrc/server/weapons/hitplot.qc +++ b/qcsrc/server/weapons/hitplot.qc @@ -2,7 +2,7 @@ #include "../antilag.qh" #include "../g_subs.qh" -#include +#include #include vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v) diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index ff5eaa59a..8c6c0eaac 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 89b4f26cf..bb204a4b5 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -1,9 +1,9 @@ #include "spawning.qh" #include "weaponsystem.qh" -#include "../mutators/_all.qh" +#include "../mutators/_mod.qh" #include -#include +#include string W_Apply_Weaponreplace(string in) { diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 398dcddcb..c06b90ec2 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -1,7 +1,7 @@ #include "throwing.qh" #include "weaponsystem.qh" -#include "../mutators/_all.qh" +#include "../mutators/_mod.qh" #include #include "../g_damage.qh" #include @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include void thrown_wep_think(entity this) diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 85551aa2b..68714da33 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc index 2b4be7e91..2ffb1c1ec 100644 --- a/qcsrc/server/weapons/weaponstats.qc +++ b/qcsrc/server/weapons/weaponstats.qc @@ -2,7 +2,7 @@ #include "../g_world.qh" -#include +#include void WeaponStats_Init() { diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index f3851f5e3..1e4212152 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -3,7 +3,7 @@ #include "selection.qh" #include "../command/common.qh" -#include "../mutators/_all.qh" +#include "../mutators/_mod.qh" #include "../round_handler.qh" #include #include @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/qcsrc/tools/genmod.sh b/qcsrc/tools/genmod.sh index 5998184bf..9a3ba1098 100755 --- a/qcsrc/tools/genmod.sh +++ b/qcsrc/tools/genmod.sh @@ -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 } diff --git a/qcsrc/tools/headerstyle.sh b/qcsrc/tools/headerstyle.sh index e40fb392a..7f86db1ee 100755 --- a/qcsrc/tools/headerstyle.sh +++ b/qcsrc/tools/headerstyle.sh @@ -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)"