From 4eab3f0253a063bdbd4e1ff64c4b2b08077c44c4 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 2 Aug 2020 07:37:25 +1000 Subject: [PATCH] Rename t_items.qc to items.qc --- qcsrc/client/hud/hud.qc | 2 +- qcsrc/client/hud/panel/ammo.qc | 2 +- qcsrc/client/main.qc | 2 +- qcsrc/common/_all.inc | 2 +- qcsrc/common/_mod.inc | 2 +- qcsrc/common/_mod.qh | 2 +- qcsrc/common/{t_items.qc => items.qc} | 2 +- qcsrc/common/{t_items.qh => items.qh} | 0 qcsrc/common/items/item/ammo.qh | 2 +- qcsrc/common/items/item/armor.qh | 2 +- qcsrc/common/items/item/health.qh | 2 +- qcsrc/common/items/item/jetpack.qh | 2 +- qcsrc/common/weapons/all.qc | 2 +- qcsrc/lib/warpzone/common.qc | 2 +- qcsrc/server/bot/default/bot.qc | 2 +- qcsrc/server/bot/default/navigation.qc | 2 +- qcsrc/server/compat/quake3.qc | 8 ++++---- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/g_damage.qh | 2 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/miscfunctions.qh | 2 +- qcsrc/server/weapons/common.qc | 2 +- qcsrc/server/weapons/csqcprojectile.qc | 2 +- qcsrc/server/weapons/selection.qc | 2 +- qcsrc/server/weapons/spawning.qc | 2 +- qcsrc/server/weapons/throwing.qc | 2 +- qcsrc/server/weapons/weaponsystem.qc | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) rename qcsrc/common/{t_items.qc => items.qc} (99%) rename qcsrc/common/{t_items.qh => items.qh} (100%) diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index b00020fe5..0bcf1fefd 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -8,7 +8,7 @@ #include "../mapvoting.qh" #include "../teamradar.qh" #include -#include +#include #include #include #include diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc index 5abbbf036..ea4c1f5ac 100644 --- a/qcsrc/client/hud/panel/ammo.qc +++ b/qcsrc/client/hud/panel/ammo.qc @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 4d187e23c..ab508e490 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -16,7 +16,7 @@ #include "hud/panel/quickmenu.qh" #include "shownames.qh" #include "view.qh" -#include +#include #include "weapons/projectile.qh" #include #include diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc index 9d7c68a8e..492b752ba 100644 --- a/qcsrc/common/_all.inc +++ b/qcsrc/common/_all.inc @@ -39,7 +39,7 @@ noref float autocvar_net_connecttimeout = 30; #include "effects/all.qc" #include "impulses/all.qc" #include "notifications/all.qc" -#include "t_items.qc" +#include "items.qc" #endif #include "items/_mod.inc" diff --git a/qcsrc/common/_mod.inc b/qcsrc/common/_mod.inc index 0ac07a19a..5df2bbd81 100644 --- a/qcsrc/common/_mod.inc +++ b/qcsrc/common/_mod.inc @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qcsrc/common/_mod.qh b/qcsrc/common/_mod.qh index 3e16f9cbe..853712e13 100644 --- a/qcsrc/common/_mod.qh +++ b/qcsrc/common/_mod.qh @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/items.qc similarity index 99% rename from qcsrc/common/t_items.qc rename to qcsrc/common/items.qc index 3b550f93e..02f44c389 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/items.qc @@ -1,4 +1,4 @@ -#include "t_items.qh" +#include "items.qh" #include "items/_mod.qh" diff --git a/qcsrc/common/t_items.qh b/qcsrc/common/items.qh similarity index 100% rename from qcsrc/common/t_items.qh rename to qcsrc/common/items.qh diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh index 22d2826fe..aae18626d 100644 --- a/qcsrc/common/items/item/ammo.qh +++ b/qcsrc/common/items/item/ammo.qh @@ -3,7 +3,7 @@ #include "pickup.qh" #include #ifdef SVQC - #include + #include #include #endif diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh index 4f605c2e6..469288b77 100644 --- a/qcsrc/common/items/item/armor.qh +++ b/qcsrc/common/items/item/armor.qh @@ -11,7 +11,7 @@ CLASS(Armor, Pickup) ENDCLASS(Armor) #ifdef SVQC - #include + #include #endif #ifdef GAMEQC diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh index 869c1838f..734a3f39b 100644 --- a/qcsrc/common/items/item/health.qh +++ b/qcsrc/common/items/item/health.qh @@ -11,7 +11,7 @@ CLASS(Health, Pickup) ENDCLASS(Health) #ifdef SVQC - #include + #include #endif #ifdef GAMEQC diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh index 2099fdc67..41a671120 100644 --- a/qcsrc/common/items/item/jetpack.qh +++ b/qcsrc/common/items/item/jetpack.qh @@ -1,7 +1,7 @@ #pragma once #ifdef SVQC - #include + #include #endif #include "ammo.qh" diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 6e5539d9a..bca6cc8a8 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -31,7 +31,7 @@ #include "config.qh" #include #include - #include "../t_items.qh" + #include "../items.qh" #include #include #include diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc index 120551b4e..2438864a5 100644 --- a/qcsrc/lib/warpzone/common.qc +++ b/qcsrc/lib/warpzone/common.qc @@ -1,7 +1,7 @@ #include "common.qh" #if defined(CSQC) - #include + #include #elif defined(MENUQC) #elif defined(SVQC) #include diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index 57de9f05c..4594da27f 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -19,7 +19,7 @@ #include "../../constants.qh" #include "../../defs.qh" #include "../../race.qh" -#include +#include #include diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index fe608d1f5..08da16f6f 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -7,7 +7,7 @@ #include "bot.qh" #include "waypoints.qh" -#include +#include #include diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc index 134956e7d..baf20c633 100644 --- a/qcsrc/server/compat/quake3.qc +++ b/qcsrc/server/compat/quake3.qc @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include @@ -249,9 +249,9 @@ spawnfunc(target_fragsFilter) //spawnfunc(item_doubler) /* handled by buffs mutator */ //spawnfunc(item_haste) /* handled by buffs mutator */ //spawnfunc(item_health) /* handled in t_quake.qc */ -//spawnfunc(item_health_large) /* handled in t_items.qc */ -//spawnfunc(item_health_small) /* handled in t_items.qc */ -//spawnfunc(item_health_mega) /* handled in t_items.qc */ +//spawnfunc(item_health_large) /* handled in items.qc */ +//spawnfunc(item_health_small) /* handled in items.qc */ +//spawnfunc(item_health_mega) /* handled in items.qc */ //spawnfunc(item_invis) /* handled by buffs mutator */ //spawnfunc(item_regen) /* handled by buffs mutator */ diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 626b3e5ac..b26c779eb 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -10,7 +10,7 @@ #include "spawnpoints.qh" #include "../common/state.qh" #include "../common/physics/player.qh" -#include "../common/t_items.qh" +#include "../common/items.qh" #include "resources.qh" #include "../common/vehicles/all.qh" #include "../common/items/_mod.qh" diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh index a99846c73..27cd8197d 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -13,7 +13,7 @@ #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" - #include + #include #include "autocvars.qh" #include "constants.qh" #include "defs.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 98bd7756a..39f26b9bf 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -7,7 +7,7 @@ #include #include "ipban.qh" #include -#include "../common/t_items.qh" +#include "../common/items.qh" #include "mapvoting.qh" #include "resources.qh" #include "items.qh" diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index 1ec27a781..bafd368f6 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc index 9486404b9..3592e3f7e 100644 --- a/qcsrc/server/weapons/common.qc +++ b/qcsrc/server/weapons/common.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc index 5352b40cd..f6fc2e622 100644 --- a/qcsrc/server/weapons/csqcprojectile.qc +++ b/qcsrc/server/weapons/csqcprojectile.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include "../command/common.qh" diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index 3f821b44f..7e9354f7d 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -1,7 +1,7 @@ #include "selection.qh" #include "weaponsystem.qh" -#include +#include #include #include #include diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 881d431ae..56f81a8aa 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -3,7 +3,7 @@ #include "weaponsystem.qh" #include "../resources.qh" #include -#include +#include #include #include diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index e36bc68c6..8730cc140 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -4,7 +4,7 @@ #include "../resources.qh" #include "../items.qh" #include -#include +#include #include "../g_damage.qh" #include #include diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index a10274ab6..dc2ed5dfe 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -7,7 +7,7 @@ #include "../round_handler.qh" #include #include -#include +#include #include #include #include -- 2.39.2