From 2aec7ddc8197ff4f7f730d5fb7c21e1d9f567a44 Mon Sep 17 00:00:00 2001 From: TimePath Date: Thu, 5 Nov 2015 22:19:41 +1100 Subject: [PATCH] Casings: move to qc effects --- qcsrc/client/progs.inc | 1 - qcsrc/common/effects/qc/all.inc | 1 + qcsrc/common/{ => effects/qc}/casings.qc | 9 ++++++--- qcsrc/server/progs.inc | 1 - 4 files changed, 7 insertions(+), 5 deletions(-) rename qcsrc/common/{ => effects/qc}/casings.qc (97%) diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index 476bbf5d7..a4eee1c73 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -29,7 +29,6 @@ #include "weapons/projectile.qc" // TODO #include "../common/animdecide.qc" -#include "../common/casings.qc" #include "../common/effects/effectinfo.qc" #include "../common/mapinfo.qc" #include "../common/movetypes/include.qc" diff --git a/qcsrc/common/effects/qc/all.inc b/qcsrc/common/effects/qc/all.inc index 2e5bfef25..7b0639610 100644 --- a/qcsrc/common/effects/qc/all.inc +++ b/qcsrc/common/effects/qc/all.inc @@ -1 +1,2 @@ +#include "casings.qc" #include "lightningarc.qc" diff --git a/qcsrc/common/casings.qc b/qcsrc/common/effects/qc/casings.qc similarity index 97% rename from qcsrc/common/casings.qc rename to qcsrc/common/effects/qc/casings.qc index 22046dd20..e79300cb0 100644 --- a/qcsrc/common/casings.qc +++ b/qcsrc/common/effects/qc/casings.qc @@ -1,8 +1,10 @@ -#include "util.qh" +#ifdef IMPLEMENTATION + +#include "../../util.qh" #ifdef CSQC -#include "movetypes/movetypes.qh" -#include "../client/rubble.qh" +#include "../../movetypes/movetypes.qh" +#include "../../../client/rubble.qh" #endif REGISTER_NET_TEMP(casings) @@ -173,3 +175,4 @@ NET_HANDLE(casings, bool isNew) } #endif +#endif diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc index 561a1d17b..6fd58e707 100644 --- a/qcsrc/server/progs.inc +++ b/qcsrc/server/progs.inc @@ -57,7 +57,6 @@ #include "../common/animdecide.qc" #include "../common/campaign_file.qc" #include "../common/campaign_setup.qc" -#include "../common/casings.qc" #include "../common/effects/effectinfo.qc" #include "../common/mapinfo.qc" #include "../common/minigames/minigames.qc" -- 2.39.2