From: TimePath Date: Mon, 14 Mar 2016 07:38:00 +0000 (+1100) Subject: Migrate relative includes in headers to #include <> X-Git-Tag: xonotic-v0.8.2~1086 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9769a6dfe490ecd437e4eaa38828107b7bea539b;p=xonotic%2Fxonotic-data.pk3dir.git Migrate relative includes in headers to #include <> --- diff --git a/qcsrc/common/command/generic.qh b/qcsrc/common/command/generic.qh index 63e1dce83..f8139aaf4 100644 --- a/qcsrc/common/command/generic.qh +++ b/qcsrc/common/command/generic.qh @@ -1,7 +1,7 @@ #ifndef COMMAND_GENERIC_H #define COMMAND_GENERIC_H -#include "../constants.qh" +#include // ========================================================= // Declarations for common command code, written by Samual diff --git a/qcsrc/common/deathtypes/all.qh b/qcsrc/common/deathtypes/all.qh index ae40ed811..903087947 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/all.qh" +#include REGISTRY(Deathtypes, BITS(8)) #define Deathtypes_from(i) _Deathtypes_from(i, NULL) diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh index eea1de9a4..ba8d86bfa 100644 --- a/qcsrc/common/items/all.qh +++ b/qcsrc/common/items/all.qh @@ -1,7 +1,7 @@ #ifndef ITEMS_ALL_H #define ITEMS_ALL_H -#include "../command/all.qh" +#include #include "item.qh" diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh index dbc74a062..9bee4e6b2 100644 --- a/qcsrc/common/items/item/pickup.qh +++ b/qcsrc/common/items/item/pickup.qh @@ -1,7 +1,7 @@ #ifndef PICKUP_H #define PICKUP_H -#include "../inventory.qh" -#include "../item.qh" +#include +#include CLASS(Pickup, GameItem) #ifndef MENUQC ATTRIB(Pickup, m_model, Model, NULL) diff --git a/qcsrc/common/minigames/minigame/all.qh b/qcsrc/common/minigames/minigame/all.qh index 5567b2568..74df391de 100644 --- a/qcsrc/common/minigames/minigame/all.qh +++ b/qcsrc/common/minigames/minigame/all.qh @@ -1,9 +1,9 @@ #pragma once #if defined(SVQC) -#include "../sv_minigames.qh" +#include #elif defined(CSQC) -#include "../cl_minigames.qh" +#include #endif /** diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index 7c29df469..a3cb49ed2 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -2,7 +2,7 @@ #define STATS_H #ifdef SVQC -#include "../server/cl_client.qh" +#include #endif // Full list of all stat constants, included in a single location for easy reference diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index 29e1fb5a6..16bfacf3c 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -1,7 +1,7 @@ #ifndef TURRETS_ALL_H #define TURRETS_ALL_H -#include "../command/all.qh" +#include #include "config.qh" #include "turret.qh" diff --git a/qcsrc/common/turrets/turret.qh b/qcsrc/common/turrets/turret.qh index 9e315e271..5ac3c2ef6 100644 --- a/qcsrc/common/turrets/turret.qh +++ b/qcsrc/common/turrets/turret.qh @@ -1,7 +1,7 @@ #ifndef TURRET_H #define TURRET_H -#include "../weapons/all.qh" +#include CLASS(Turret, Object) ATTRIB(Turret, m_id, int, 0) diff --git a/qcsrc/common/vehicles/sv_vehicles.qh b/qcsrc/common/vehicles/sv_vehicles.qh index 289997e5d..e9a4d3f39 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qh +++ b/qcsrc/common/vehicles/sv_vehicles.qh @@ -2,7 +2,7 @@ #define VEHICLES_DEF_H #ifdef SVQC -#include "../turrets/sv_turrets.qh" +#include // vehicle cvars bool autocvar_g_vehicles = true; diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 5e87a3c3a..6f380ecec 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -1,8 +1,8 @@ #ifndef WEAPONS_ALL_H #define WEAPONS_ALL_H -#include "../command/all.qh" -#include "../stats.qh" +#include +#include #include "config.qh" // weapon sets @@ -24,7 +24,7 @@ WepSet ReadWepSet(); #include #endif -#include "../util.qh" +#include #ifdef SVQC #include diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index 4a12dee27..bd5172bda 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -1,7 +1,7 @@ #ifndef WEAPON_H #define WEAPON_H -#include "../items/item/pickup.qh" -#include "../stats.qh" +#include +#include const int MAX_WEAPONSLOTS = 2; .entity weaponentities[MAX_WEAPONSLOTS]; @@ -126,7 +126,7 @@ CLASS(Weapon, Object) } ENDCLASS(Weapon) -#include "../items/all.qh" +#include CLASS(WeaponPickup, Pickup) ATTRIB(WeaponPickup, m_weapon, Weapon, NULL) ATTRIB(WeaponPickup, m_name, string, string_null) diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh index 8bc24a16e..2df331950 100644 --- a/qcsrc/menu/menu.qh +++ b/qcsrc/menu/menu.qh @@ -5,8 +5,8 @@ #include "xonotic/util.qh" -#include "../common/constants.qh" -#include "../common/util.qh" +#include +#include const int GAME_ISSERVER = BIT(0); const int GAME_CONNECTED = BIT(1); diff --git a/qcsrc/server/cheats.qh b/qcsrc/server/cheats.qh index 03b5ac8dd..97df2467b 100644 --- a/qcsrc/server/cheats.qh +++ b/qcsrc/server/cheats.qh @@ -1,6 +1,6 @@ #pragma once -#include "../common/impulses/all.qh" +#include //float autocvar_sv_cheats; // must... declare... global diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 245719b32..8139325f9 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -1,7 +1,7 @@ #pragma once -#include "../common/weapons/all.qh" -#include "../common/stats.qh" +#include +#include #define INDEPENDENT_ATTACK_FINISHED 1 diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh index be570eb7f..38094ef95 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -3,25 +3,25 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../lib/warpzone/common.qh" - #include "../common/constants.qh" - #include "../common/teams.qh" - #include "../common/util.qh" - #include "../common/weapons/all.qh" + #include + #include + #include + #include + #include #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" - #include "../common/t_items.qh" + #include #include "autocvars.qh" #include "constants.qh" #include "defs.qh" - #include "../common/notifications/all.qh" - #include "../common/deathtypes/all.qh" + #include + #include #include "mutators/all.qh" - #include "../common/turrets/sv_turrets.qh" - #include "../common/vehicles/all.qh" - #include "../lib/csqcmodel/sv_model.qh" - #include "../common/playerstats.qh" + #include + #include + #include + #include #include "g_hook.qh" #include "scores.qh" #include "spawnpoints.qh" diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index f87860f8f..dd93aa329 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -1,12 +1,12 @@ #pragma once -#include "../common/t_items.qh" +#include #include "mutators/events.qh" -#include "../common/constants.qh" -#include "../common/mapinfo.qh" -#include "../common/turrets/all.qh" +#include +#include +#include #ifdef RELEASE #define cvar_string_normal builtin_cvar_string diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh index de3a215fe..bec3ca98c 100644 --- a/qcsrc/server/mutators/gamemode.qh +++ b/qcsrc/server/mutators/gamemode.qh @@ -1,30 +1,30 @@ #pragma once -#include "../cl_client.qh" -#include "../cl_player.qh" -#include "../cl_impulse.qh" -#include "../cheats.qh" -#include "../g_damage.qh" -#include "../round_handler.qh" -#include "../scores.qh" -#include "../scores_rules.qh" -#include "../teamplay.qh" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../bot/bot.qh" -#include "../bot/navigation.qh" -#include "../bot/waypoints.qh" -#include "../bot/havocbot/roles.qh" +#include +#include +#include +#include -#include "../bot/havocbot/havocbot.qh" +#include -#include "../command/vote.qh" +#include #include -#include "../command/common.qh" +#include -#include "../weapons/tracing.qh" -#include "../weapons/weaponsystem.qh" +#include +#include #include #include diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh index 636efab13..40fad29b3 100644 --- a/qcsrc/server/mutators/mutator.qh +++ b/qcsrc/server/mutators/mutator.qh @@ -2,29 +2,29 @@ #include -#include "../cl_client.qh" -#include "../cl_player.qh" -#include "../cl_impulse.qh" -#include "../cheats.qh" -#include "../g_damage.qh" -#include "../round_handler.qh" -#include "../scores.qh" -#include "../scores_rules.qh" - -#include "../bot/bot.qh" -#include "../bot/navigation.qh" -#include "../bot/waypoints.qh" - -#include "../bot/havocbot/havocbot.qh" -#include "../bot/havocbot/roles.qh" - -#include "../command/vote.qh" -#include "../command/common.qh" - -#include "../weapons/common.qh" -#include "../weapons/tracing.qh" -#include "../weapons/throwing.qh" -#include "../weapons/weaponsystem.qh" +#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/server/scores.qh b/qcsrc/server/scores.qh index 497e5a6ae..b547730ef 100644 --- a/qcsrc/server/scores.qh +++ b/qcsrc/server/scores.qh @@ -1,6 +1,6 @@ #pragma once -#include "../common/constants.qh" +#include entity scores_initialized; // non-world when scores labels/rules have been set .float scores[MAX_SCORE];