From 829a812da653d84460edd31a9651bde65d3bb269 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 27 Sep 2015 16:13:31 +1000 Subject: [PATCH] Turrets: Rename includes to `all` --- qcsrc/client/main.qc | 1 - qcsrc/client/progs.inc | 2 +- qcsrc/common/turrets/{turrets.qc => all.qc} | 2 +- qcsrc/common/turrets/{turrets.qh => all.qh} | 0 qcsrc/common/turrets/cl_turrets.qc | 2 +- qcsrc/common/turrets/cl_turrets.qh | 2 ++ qcsrc/common/turrets/sv_turrets.qc | 1 + qcsrc/common/turrets/sv_turrets.qh | 2 ++ qcsrc/server/miscfunctions.qh | 2 +- qcsrc/server/progs.inc | 2 +- 10 files changed, 10 insertions(+), 6 deletions(-) rename qcsrc/common/turrets/{turrets.qc => all.qc} (74%) rename qcsrc/common/turrets/{turrets.qh => all.qh} (100%) diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 2d01f777e..5dec3202f 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -48,7 +48,6 @@ #include "../common/triggers/include.qh" #include "../common/turrets/cl_turrets.qh" -#include "../common/turrets/turrets.qh" #include "../warpzonelib/client.qh" diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index b985e36f6..1b9c587ab 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -59,7 +59,7 @@ #include "../common/weapons/all.qc" #include "../common/turrets/cl_turrets.qc" -#include "../common/turrets/turrets.qc" +#include "../common/turrets/all.qc" #include "../common/triggers/include.qc" diff --git a/qcsrc/common/turrets/turrets.qc b/qcsrc/common/turrets/all.qc similarity index 74% rename from qcsrc/common/turrets/turrets.qc rename to qcsrc/common/turrets/all.qc index 1b43468ca..f0fc7195a 100644 --- a/qcsrc/common/turrets/turrets.qc +++ b/qcsrc/common/turrets/all.qc @@ -1,4 +1,4 @@ -#include "turrets.qh" +#include "all.qh" #define IMPLEMENTATION #include "all.inc" diff --git a/qcsrc/common/turrets/turrets.qh b/qcsrc/common/turrets/all.qh similarity index 100% rename from qcsrc/common/turrets/turrets.qh rename to qcsrc/common/turrets/all.qh diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc index 1418a8f39..b2a0fe1b5 100644 --- a/qcsrc/common/turrets/cl_turrets.qc +++ b/qcsrc/common/turrets/cl_turrets.qc @@ -1,4 +1,4 @@ -#include "turrets.qh" +#include "all.qh" void turret_remove() {SELFPARAM(); diff --git a/qcsrc/common/turrets/cl_turrets.qh b/qcsrc/common/turrets/cl_turrets.qh index 0f8ff9485..f8ea64ad1 100644 --- a/qcsrc/common/turrets/cl_turrets.qh +++ b/qcsrc/common/turrets/cl_turrets.qh @@ -1,6 +1,8 @@ #ifndef CL_TURRETS_H #define CL_TURRETS_H +#include "all.qh" + void ent_turret(); #endif diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index 337b2789a..c17061b22 100644 --- a/qcsrc/common/turrets/sv_turrets.qc +++ b/qcsrc/common/turrets/sv_turrets.qc @@ -1,4 +1,5 @@ #ifdef SVQC +#include "all.qh" #include "../../server/autocvars.qh" // Generic aiming diff --git a/qcsrc/common/turrets/sv_turrets.qh b/qcsrc/common/turrets/sv_turrets.qh index 8bba1c4a4..1a4ade680 100644 --- a/qcsrc/common/turrets/sv_turrets.qh +++ b/qcsrc/common/turrets/sv_turrets.qh @@ -1,6 +1,8 @@ #ifndef SV_TURRETS_H #define SV_TURRETS_H +#include "all.qh" + // turret fields .float ticrate; // interal ai think rate .vector aim_idle; // where to aim while idle diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index f1f003820..37e9073f3 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -8,7 +8,7 @@ #include "../common/constants.qh" #include "../common/mapinfo.qh" -#include "../common/turrets/turrets.qh" +#include "../common/turrets/all.qh" #ifdef RELEASE #define cvar_string_normal builtin_cvar_string diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc index c4cddb2d3..4eceb36b9 100644 --- a/qcsrc/server/progs.inc +++ b/qcsrc/server/progs.inc @@ -107,7 +107,7 @@ #include "../common/turrets/sv_turrets.qc" #include "../common/turrets/config.qc" #include "../common/turrets/util.qc" -#include "../common/turrets/turrets.qc" +#include "../common/turrets/all.qc" #include "../common/turrets/checkpoint.qc" #include "../common/turrets/targettrigger.qc" #include "../common/weapons/config.qc" -- 2.39.2