From 6e7fae90a84673482a986aa83a6b618fb23c7eb5 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 6 Mar 2016 21:16:20 +1100 Subject: [PATCH] Notifications: relocate --- qcsrc/client/announcer.qc | 2 +- qcsrc/common/_all.inc | 2 +- qcsrc/common/command/generic.qc | 2 +- qcsrc/common/deathtypes/all.qh | 2 +- .../{notifications.inc => notifications/all.inc} | 0 .../{notifications.qc => notifications/all.qc} | 14 +++++++------- .../{notifications.qh => notifications/all.qh} | 10 +++++----- qcsrc/common/t_items.qc | 2 +- qcsrc/common/util.qc | 4 ++-- qcsrc/common/weapons/all.qc | 2 +- qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/command/common.qc | 2 +- qcsrc/server/command/sv_cmd.qc | 2 +- qcsrc/server/command/vote.qc | 2 +- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/g_damage.qh | 2 +- qcsrc/server/g_world.qc | 2 +- qcsrc/server/item_key.qc | 2 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/mutators/all.qc | 2 +- qcsrc/server/mutators/gamemode.qh | 2 +- qcsrc/server/mutators/mutator.qh | 2 +- qcsrc/server/portals.qc | 2 +- qcsrc/server/race.qc | 2 +- qcsrc/server/weapons/common.qc | 2 +- qcsrc/server/weapons/throwing.qc | 2 +- qcsrc/server/weapons/weaponsystem.qc | 2 +- 27 files changed, 37 insertions(+), 37 deletions(-) rename qcsrc/common/{notifications.inc => notifications/all.inc} (100%) rename qcsrc/common/{notifications.qc => notifications/all.qc} (99%) rename qcsrc/common/{notifications.qh => notifications/all.qh} (99%) diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index dbf0cd807..12d07d150 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -2,7 +2,7 @@ #include "mutators/events.qh" -#include +#include #include bool announcer_1min; diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc index 9c888b91a..5ebc52886 100644 --- a/qcsrc/common/_all.inc +++ b/qcsrc/common/_all.inc @@ -30,7 +30,7 @@ #include "deathtypes/all.qc" #include "effects/all.qc" #include "impulses/all.qc" -#include "notifications.qc" +#include "notifications/all.qc" #include "t_items.qc" #endif diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 04fbc445d..a720796ce 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -6,7 +6,7 @@ #include "../mapinfo.qh" #ifndef MENUQC - #include "../notifications.qh" + #include "../notifications/all.qh" #endif #ifdef CSQC diff --git a/qcsrc/common/deathtypes/all.qh b/qcsrc/common/deathtypes/all.qh index 7dbbba87c..ae40ed811 100644 --- a/qcsrc/common/deathtypes/all.qh +++ b/qcsrc/common/deathtypes/all.qh @@ -1,7 +1,7 @@ #ifndef DEATHTYPES_ALL_H #define DEATHTYPES_ALL_H -#include "../notifications.qh" +#include "../notifications/all.qh" REGISTRY(Deathtypes, BITS(8)) #define Deathtypes_from(i) _Deathtypes_from(i, NULL) diff --git a/qcsrc/common/notifications.inc b/qcsrc/common/notifications/all.inc similarity index 100% rename from qcsrc/common/notifications.inc rename to qcsrc/common/notifications/all.inc diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications/all.qc similarity index 99% rename from qcsrc/common/notifications.qc rename to qcsrc/common/notifications/all.qc index 5bfcfce5f..e52e9de09 100644 --- a/qcsrc/common/notifications.qc +++ b/qcsrc/common/notifications/all.qc @@ -1,13 +1,13 @@ #if defined(CSQC) - #include "../client/announcer.qh" + #include #elif defined(MENUQC) #elif defined(SVQC) - #include "constants.qh" - #include "teams.qh" - #include "../server/autocvars.qh" - #include "../server/constants.qh" - #include "../server/defs.qh" - #include "notifications.qh" + #include + #include + #include + #include + #include + #include "all.qh" #include #endif diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications/all.qh similarity index 99% rename from qcsrc/common/notifications.qh rename to qcsrc/common/notifications/all.qh index 40a72a349..ffadf6ec1 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications/all.qh @@ -3,9 +3,9 @@ #include -#include "constants.qh" -#include "teams.qh" -#include "util.qh" +#include +#include +#include /** main types/groups of notifications */ ENUMCLASS(MSG) @@ -317,7 +317,7 @@ float autocvar_notification_show_sprees_center_specialonly = true; // ============================ /* These arguments get replaced with the Local_Notification_sprintf - and other such functions found in notifications.qc to supply data + and other such functions found in all.qc to supply data from networked notifications to their usage in sprintf... It allows for more dynamic data to be inferred by the local notification parser, so that the server does not have to network @@ -799,6 +799,6 @@ REGISTRY_END(Notifications) LOG_SEVERE("Notification initialization failed! Read above and fix the errors!"); } -#include "notifications.inc" +#include "all.inc" #endif diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 9c8c42115..534a22a21 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -15,7 +15,7 @@ #include "constants.qh" #include - #include + #include #include "triggers/subs.qh" #include "util.qh" diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 7bafe2bc1..03ab8f6d5 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -5,7 +5,7 @@ #include "constants.qh" #include "../client/mutators/events.qh" #include "mapinfo.qh" - #include "notifications.qh" + #include "notifications/all.qh" #include #elif defined(MENUQC) #elif defined(SVQC) @@ -13,7 +13,7 @@ #include "../server/autocvars.qh" #include "../server/defs.qh" #include "../server/mutators/events.qh" - #include "notifications.qh" + #include "notifications/all.qh" #include #include "mapinfo.qh" #endif diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 6232db886..c1a7e3023 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -35,7 +35,7 @@ #include #include #include - #include "../notifications.qh" + #include "../notifications/all.qh" #include "../deathtypes/all.qh" #include #include "../mapinfo.qh" diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 95f0556b3..9246f7aa1 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index 4c155d07d..d2a8f6ec9 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -4,7 +4,7 @@ #include "../scores.qh" #include -#include +#include #include diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 33e9273bb..369b3eaa9 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 223bbeb09..c4303f479 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 8a274a9a2..9258b3e82 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -14,7 +14,7 @@ #include "weapons/selection.qh" #include "../common/constants.qh" #include "../common/deathtypes/all.qh" -#include "../common/notifications.qh" +#include "../common/notifications/all.qh" #include "../common/physics/movetypes/movetypes.qh" #include "../common/playerstats.qh" #include "../common/teams.qh" diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh index 1f4f3b5d2..6a8ca99b4 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -16,7 +16,7 @@ #include "autocvars.qh" #include "constants.qh" #include "defs.qh" - #include "../common/notifications.qh" + #include "../common/notifications/all.qh" #include "../common/deathtypes/all.qh" #include "mutators/all.qh" #include "../common/turrets/sv_turrets.qh" diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index c1f0e48ac..416a1584c 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -24,7 +24,7 @@ #include "../common/monsters/all.qh" #include "../common/monsters/sv_monsters.qh" #include "../common/vehicles/all.qh" -#include "../common/notifications.qh" +#include "../common/notifications/all.qh" #include "../common/physics/player.qh" #include "../common/playerstats.qh" #include "../common/stats.qh" diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc index d1e1f32e4..0230a21cb 100644 --- a/qcsrc/server/item_key.qc +++ b/qcsrc/server/item_key.qc @@ -2,7 +2,7 @@ #include "../common/triggers/subs.qh" #include "../common/monsters/all.qh" -#include "../common/notifications.qh" +#include "../common/notifications/all.qh" #include "../common/util.qh" #include "../lib/warpzone/util_server.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 2a3ef8734..74fa6399f 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -13,7 +13,7 @@ #include "../common/constants.qh" #include "../common/deathtypes/all.qh" #include "../common/mapinfo.qh" -#include "../common/notifications.qh" +#include "../common/notifications/all.qh" #include "../common/playerstats.qh" #include "../common/teams.qh" #include "../common/triggers/subs.qh" diff --git a/qcsrc/server/mutators/all.qc b/qcsrc/server/mutators/all.qc index 5c6906b7c..2cca71c7c 100644 --- a/qcsrc/server/mutators/all.qc +++ b/qcsrc/server/mutators/all.qc @@ -34,7 +34,7 @@ #include "../autocvars.qh" #include "../constants.qh" #include "../defs.qh" - #include + #include #include #include "all.qh" #include diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh index 5c17e9a17..b83704650 100644 --- a/qcsrc/server/mutators/gamemode.qh +++ b/qcsrc/server/mutators/gamemode.qh @@ -28,7 +28,7 @@ #include "../weapons/weaponsystem.qh" #include -#include +#include #include #include #include diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh index c29e10eb8..485bce298 100644 --- a/qcsrc/server/mutators/mutator.qh +++ b/qcsrc/server/mutators/mutator.qh @@ -28,7 +28,7 @@ #include "../weapons/weaponsystem.qh" #include -#include +#include #include #include #include diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index 361abcd11..e3cba9383 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -4,7 +4,7 @@ #include "mutators/all.qh" #include "../common/constants.qh" #include "../common/deathtypes/all.qh" -#include "../common/notifications.qh" +#include "../common/notifications/all.qh" #include "../common/triggers/teleporters.qh" #include "../common/triggers/subs.qh" #include "../common/util.qh" diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 0cac389aa..dd3a11cc0 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -8,7 +8,7 @@ #include "bot/navigation.qh" #include "command/getreplies.qh" #include "../common/deathtypes/all.qh" -#include "../common/notifications.qh" +#include "../common/notifications/all.qh" #include "../common/mapinfo.qh" #include "../common/triggers/subs.qh" #include "../lib/warpzone/util_server.qh" diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc index c4a0daba4..85e8820f3 100644 --- a/qcsrc/server/weapons/common.qc +++ b/qcsrc/server/weapons/common.qc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 14da0f14e..7ffc68105 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -6,7 +6,7 @@ #include "../g_damage.qh" #include #include -#include +#include #include #include #include diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 1637d8676..62d54973c 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include -- 2.39.2