effects: remove IMPLEMENTATION

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 479dd7e8eab8486ed14e23b1b333a58df3a1ac59..64b340622a16a2ee2a3ea5f87d98efb97b1d3ea6 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1,8 +1,10 @@
 #include "main.qh"
 
+#include "defs.qh"
+#include <common/ent_cs.qh>
 #include "miscfunctions.qh"
 #include <common/effects/effect.qh>
-#include <common/effects/qc/all.qh>
+#include <common/effects/qc/_mod.qh>
 #include <common/effects/all.qh>
 #include <common/effects/all.inc>
 #include "hud/_mod.qh"

diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc
index f6a7999d440a455a30dc5d0b70aa9e74f4113139..3b607a7e14add199cd354940018de71d588f2566 100644 (file)
--- a/qcsrc/client/progs.inc
+++ b/qcsrc/client/progs.inc
@@ -5,7 +5,7 @@
 #include <client/_mod.inc>
 
 #include <common/_all.inc>
-#include <common/effects/qc/all.qc>
+#include <common/effects/qc/_mod.inc>
 
 #include <lib/csqcmodel/cl_model.qc>
 #include <lib/csqcmodel/cl_player.qc>

diff --git a/qcsrc/common/effects/qc/_mod.inc b/qcsrc/common/effects/qc/_mod.inc
index befcce83d8d95ee23300856661ba1fab3ffe46e8..8df95b821ae2ea07cec594230396235d74fb2529 100644 (file)
--- a/qcsrc/common/effects/qc/_mod.inc
+++ b/qcsrc/common/effects/qc/_mod.inc
@@ -1,5 +1,4 @@
 // generated file; do not modify
-#include <common/effects/qc/all.qc>
 #include <common/effects/qc/casings.qc>
 #include <common/effects/qc/damageeffects.qc>
 #include <common/effects/qc/gibs.qc>

diff --git a/qcsrc/common/effects/qc/_mod.qh b/qcsrc/common/effects/qc/_mod.qh
index 91298f3124d61c972b9d6bdd970d241c5f882acc..3f6387f0eb21a179d6a259466c914dfbb6cc4d19 100644 (file)
--- a/qcsrc/common/effects/qc/_mod.qh
+++ b/qcsrc/common/effects/qc/_mod.qh
@@ -1,5 +1,4 @@
 // generated file; do not modify
-#include <common/effects/qc/all.qh>
 #include <common/effects/qc/casings.qh>
 #include <common/effects/qc/damageeffects.qh>
 #include <common/effects/qc/gibs.qh>

diff --git a/qcsrc/common/effects/qc/all.inc b/qcsrc/common/effects/qc/all.inc
deleted file mode 100644 (file)
index 6b5c2ff..0000000
--- a/qcsrc/common/effects/qc/all.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "casings.qc"
-#include "damageeffects.qc"
-#include "gibs.qc"
-#include "globalsound.qc"
-#include "lightningarc.qc"
-#include "modeleffects.qc"

diff --git a/qcsrc/common/effects/qc/all.qc b/qcsrc/common/effects/qc/all.qc
deleted file mode 100644 (file)
index f0fc719..0000000
--- a/qcsrc/common/effects/qc/all.qc
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "all.qh"
-
-#define IMPLEMENTATION
-#include "all.inc"
-#undef IMPLEMENTATION

diff --git a/qcsrc/common/effects/qc/all.qh b/qcsrc/common/effects/qc/all.qh
deleted file mode 100644 (file)
index 54cf6b6..0000000
--- a/qcsrc/common/effects/qc/all.qh
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "all.inc"

diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc
index d0befbb7ed04705feb92bb01e63d291011003bed..60f9633027eb2125d0278bd6abaaa2cb9ed1505a 100644 (file)
--- a/qcsrc/common/effects/qc/casings.qc
+++ b/qcsrc/common/effects/qc/casings.qc
@@ -1,9 +1,4 @@
 #include "casings.qh"
-#ifdef SVQC
-void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, int casingtype, entity casingowner, .entity weaponentity);
-#endif
-
-#ifdef IMPLEMENTATION
 
 #include <common/util.qh>
 
@@ -178,4 +173,3 @@ NET_HANDLE(casings, bool isNew)
 }
 
 #endif
-#endif

diff --git a/qcsrc/common/effects/qc/casings.qh b/qcsrc/common/effects/qc/casings.qh
index 6f70f09beec2219624baeca92e2cd7deaa104fb4..137aa365ca1412b16c83b6eda2b0ca681d13709d 100644 (file)
--- a/qcsrc/common/effects/qc/casings.qh
+++ b/qcsrc/common/effects/qc/casings.qh
@@ -1 +1,5 @@
 #pragma once
+
+#ifdef SVQC
+void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, int casingtype, entity casingowner, .entity weaponentity);
+#endif

diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc
index 38241c2cc2df62999807f2cc2b153580a2c40d15..c85d66eeb6686cee70d27d77482757baf0336550 100644 (file)
--- a/qcsrc/common/effects/qc/damageeffects.qc
+++ b/qcsrc/common/effects/qc/damageeffects.qc
@@ -1,7 +1,5 @@
 #include "damageeffects.qh"
 
-#ifdef IMPLEMENTATION
-
 REGISTER_NET_LINKED(ENT_CLIENT_DAMAGEINFO)
 
 #ifdef SVQC
@@ -415,5 +413,3 @@ NET_HANDLE(ENT_CLIENT_DAMAGEINFO, bool isNew)
 }
 
 #endif
-
-#endif

diff --git a/qcsrc/common/effects/qc/gibs.qc b/qcsrc/common/effects/qc/gibs.qc
index d1e3d9880da4244206e9ea38ef037c38a828653b..7be63e2e55c5e1056a544f23ae9bc0331ec8138a 100644 (file)
--- a/qcsrc/common/effects/qc/gibs.qc
+++ b/qcsrc/common/effects/qc/gibs.qc
@@ -1,6 +1,5 @@
 #include "gibs.qh"
 
-#ifdef IMPLEMENTATION
 REGISTER_NET_TEMP(net_gibsplash)
 
 #ifdef SVQC
@@ -314,5 +313,3 @@ NET_HANDLE(net_gibsplash, bool isNew)
        delete(this);
 }
 #endif
-
-#endif

diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
index c3aaf62d46d7e91d5c78679585c82d471374665f..edf995a0f6ccf453f64aa49ff175608aa3c6205f 100644 (file)
--- a/qcsrc/common/effects/qc/globalsound.qc
+++ b/qcsrc/common/effects/qc/globalsound.qc
@@ -2,7 +2,6 @@
 
 #include <common/ent_cs.qh>
 
-#ifdef IMPLEMENTATION
        #include <common/animdecide.qh>
 
        #ifdef SVQC
@@ -436,4 +435,3 @@
                }
 
        #endif
-#endif

diff --git a/qcsrc/common/effects/qc/lightningarc.qc b/qcsrc/common/effects/qc/lightningarc.qc
index c1c3bb8872c3ea917e51168b90be0a8566d43a75..6388575b72cb09a5baa576a0e8c3882fdeff8ffb 100644 (file)
--- a/qcsrc/common/effects/qc/lightningarc.qc
+++ b/qcsrc/common/effects/qc/lightningarc.qc
@@ -1,6 +1,5 @@
 #include "lightningarc.qh"
 
-#ifdef IMPLEMENTATION
 REGISTER_NET_TEMP(TE_CSQC_ARC)
 
 #if defined(SVQC)
@@ -117,5 +116,3 @@ void b_make(vector s,vector e, string t,float l,float z)
        }
 
 #endif
-
-#endif

diff --git a/qcsrc/common/effects/qc/modeleffects.qc b/qcsrc/common/effects/qc/modeleffects.qc
index 8fbef5b587e9c56a7ed1f7cbc20d445cd32dab4f..1b70daee2fbbd5621e8e33198ffcec7c7380b2fd 100644 (file)
--- a/qcsrc/common/effects/qc/modeleffects.qc
+++ b/qcsrc/common/effects/qc/modeleffects.qc
@@ -1,7 +1,5 @@
 #include "modeleffects.qh"
 
-#ifdef IMPLEMENTATION
-
 REGISTER_NET_LINKED(ENT_CLIENT_MODELEFFECT)
 
 #ifdef SVQC
@@ -162,5 +160,3 @@ NET_HANDLE(ENT_CLIENT_MODELEFFECT, bool isnew)
        return true;
 }
 #endif
-
-#endif

diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc
index b03766bcf234b55d4753b5c65a1c2dddb1b91922..338acacd61fdb343357451cc09c801526196cc2e 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -50,7 +50,7 @@ void M_Shambler_Attack_Swing(entity this)
        Monster_Attack_Melee(this, this.enemy, (autocvar_g_monster_shambler_attack_claw_damage), ((random() >= 0.5) ? this.anim_melee2 : this.anim_melee3), this.attack_range, 0.8, DEATH_MONSTER_SHAMBLER_CLAW.m_id, true);
 }
 
-#include <common/effects/qc/all.qh>
+#include <common/effects/qc/_mod.qh>
 
 void M_Shambler_Attack_Lightning_Explode(entity this, entity directhitentity)
 {

diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh
index ab24ec4a87d894c6c924ebde154b2df753e88516..ea2e2e1730546bc7686b65b55172063a04b00f1a 100644 (file)
--- a/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@ -4,7 +4,7 @@
 #include <common/stats.qh>
 
 #ifdef SVQC
-#include <common/effects/qc/all.qh>
+#include <common/effects/qc/_mod.qh>
 #endif
 
 USING(WepSet, vector);

diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh
index ac8746516ca516b0552d56f6a26a1f2eea633cdb..c6fdeb244148177b306989260bf1474244b60f5e 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -91,7 +91,7 @@
 #include <server/weapons/weaponsystem.qh>
 
 #include <common/physics/player.qh>
-#include <common/effects/qc/all.qh>
+#include <common/effects/qc/_mod.qh>
 #include <common/deathtypes/all.qh>
 #include <common/notifications/all.qh>
 #include <common/triggers/teleporters.qh>

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 9ac2249a234b50bd1bbf33dab9d2739dd433b1c3..931ef826d9931f8889855b54dc89265520a1a8c7 100644 (file)
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -22,7 +22,7 @@
 #include "../common/minigames/sv_minigames.qh"
 
 #include "../common/physics/player.qh"
-#include "../common/effects/qc/all.qh"
+#include "../common/effects/qc/_mod.qh"
 #include "../common/mutators/mutator/waypoints/waypointsprites.qh"
 #include "../common/triggers/include.qh"
 #include "../common/wepent.qh"

diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc
index f72ff8533f57555adc4e0a49526f59ab07b8b463..fd0b0c99e2d60dc5f382747a860548a706b12017 100644 (file)
--- a/qcsrc/server/progs.inc
+++ b/qcsrc/server/progs.inc
@@ -5,7 +5,7 @@
 #include <server/_mod.inc>
 
 #include <common/_all.inc>
-#include <common/effects/qc/all.qc>
+#include <common/effects/qc/_mod.inc>
 
 #include <lib/csqcmodel/sv_model.qc>