From 2d3ed896c16fcbad16cdf83b1ffae348053aab96 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 2 Aug 2020 08:07:07 +1000 Subject: [PATCH] Rename server/items.qc to server/items/spawning.qc --- qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc | 2 +- qcsrc/common/items/item.qh | 2 +- qcsrc/common/weapons/all.qc | 2 +- qcsrc/server/_mod.inc | 2 +- qcsrc/server/_mod.qh | 2 +- qcsrc/server/bot/default/havocbot/roles.qc | 2 +- qcsrc/server/compat/quake3.qc | 2 +- qcsrc/server/compat/wop.qc | 2 +- qcsrc/server/items/_mod.inc | 2 ++ qcsrc/server/items/_mod.qh | 2 ++ qcsrc/server/{items.qc => items/spawning.qc} | 4 ++-- qcsrc/server/{items.qh => items/spawning.qh} | 0 qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/weapons/selection.qc | 2 +- qcsrc/server/weapons/spawning.qc | 2 +- qcsrc/server/weapons/throwing.qc | 2 +- 16 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 qcsrc/server/items/_mod.inc create mode 100644 qcsrc/server/items/_mod.qh rename qcsrc/server/{items.qc => items/spawning.qc} (98%) rename qcsrc/server/{items.qh => items/spawning.qh} (100%) diff --git a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc index c08176cf8d..3f787fa3cf 100644 --- a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc +++ b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc @@ -2,7 +2,7 @@ #include #include -#include +#include float autocvar_g_cts_finish_kill_delay; bool autocvar_g_cts_selfdamage; diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index a8b8b46757..ef909382b8 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -8,7 +8,7 @@ #endif #ifdef SVQC -#include +#include #endif const int IT_UNLIMITED_AMMO = BIT(0); // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup. diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index bca6cc8a8a..92727b4c0a 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -31,7 +31,7 @@ #include "config.qh" #include #include - #include "../items.qh" + #include #include #include #include diff --git a/qcsrc/server/_mod.inc b/qcsrc/server/_mod.inc index 6c66dd95f0..7634e76357 100644 --- a/qcsrc/server/_mod.inc +++ b/qcsrc/server/_mod.inc @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/_mod.qh b/qcsrc/server/_mod.qh index 06bb03df30..331fdcd854 100644 --- a/qcsrc/server/_mod.qh +++ b/qcsrc/server/_mod.qh @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/bot/default/havocbot/roles.qc b/qcsrc/server/bot/default/havocbot/roles.qc index d078cae860..8081097b46 100644 --- a/qcsrc/server/bot/default/havocbot/roles.qc +++ b/qcsrc/server/bot/default/havocbot/roles.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include "havocbot.qh" diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc index baf20c6333..4103ccf29a 100644 --- a/qcsrc/server/compat/quake3.qc +++ b/qcsrc/server/compat/quake3.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/qcsrc/server/compat/wop.qc b/qcsrc/server/compat/wop.qc index d2577b46af..bd399bffd3 100644 --- a/qcsrc/server/compat/wop.qc +++ b/qcsrc/server/compat/wop.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include spawnfunc(item_haste); diff --git a/qcsrc/server/items/_mod.inc b/qcsrc/server/items/_mod.inc new file mode 100644 index 0000000000..9c55d0b5c3 --- /dev/null +++ b/qcsrc/server/items/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/items/_mod.qh b/qcsrc/server/items/_mod.qh new file mode 100644 index 0000000000..eb6ff1ce5d --- /dev/null +++ b/qcsrc/server/items/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/items.qc b/qcsrc/server/items/spawning.qc similarity index 98% rename from qcsrc/server/items.qc rename to qcsrc/server/items/spawning.qc index ab53a10fc3..bbe6622273 100644 --- a/qcsrc/server/items.qc +++ b/qcsrc/server/items/spawning.qc @@ -1,8 +1,8 @@ -#include "items.qh" +#include "spawning.qh" /// \file /// \brief Source file that contains implementation of the functions related to -/// game items. +/// creation of game items. /// \copyright GNU GPLv2 or any later version. #include diff --git a/qcsrc/server/items.qh b/qcsrc/server/items/spawning.qh similarity index 100% rename from qcsrc/server/items.qh rename to qcsrc/server/items/spawning.qh diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 39f26b9bfd..bb99abb4b9 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -10,7 +10,7 @@ #include "../common/items.qh" #include "mapvoting.qh" #include "resources.qh" -#include "items.qh" +#include #include "player.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index 7e9354f7dd..94034bdbb8 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -2,7 +2,7 @@ #include "weaponsystem.qh" #include -#include +#include #include #include #include diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 56f81a8aaa..684ea842b9 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -4,7 +4,7 @@ #include "../resources.qh" #include #include -#include +#include #include .bool m_isreplaced; ///< Holds whether the weapon has been replaced. diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 8730cc1405..d111a7a4fa 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -2,7 +2,7 @@ #include "weaponsystem.qh" #include "../resources.qh" -#include "../items.qh" +#include #include #include #include "../g_damage.qh" -- 2.39.2