From: Mario <mario@smbclan.net>
Date: Sat, 17 Feb 2018 01:49:43 +0000 (+1000)
Subject: Move DMG_NOWEP to defs.qh to reduce compilation unit madness
X-Git-Tag: xonotic-v0.8.5~2307
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca930a6f9c9086eae6d7ef29c80bd3ae69b1d1a8;p=xonotic%2Fxonotic-data.pk3dir.git

Move DMG_NOWEP to defs.qh to reduce compilation unit madness
---

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index d8bc4b027..185a68a85 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -230,6 +230,9 @@ int have_team_spawns_forteams; // if Xth bit is 1 then team X has spawns else it
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force);
 
+// WEAPONTODO
+#define DMG_NOWEP (weaponentities[0])
+
 float lockteams;
 
 float sv_maxidle;
diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh
index 54866348d..4f68c2ea0 100644
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -113,6 +113,3 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt);
 void Fire_ApplyDamage(entity e);
 
 void Fire_ApplyEffect(entity e);
-
-// WEAPONTODO
-#define DMG_NOWEP (weaponentities[0])