From: Samual Lenks <samual@xonotic.org>
Date: Tue, 31 Dec 2013 19:26:31 +0000 (-0500)
Subject: Move WANT_CONST to the same place that it is actually USED :P Plus add comment explai... 
X-Git-Tag: xonotic-v0.8.0~152^2~184
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2423bffda59c5c427a4b9107f9330ee00af647c7;p=xonotic%2Fxonotic-data.pk3dir.git

Move WANT_CONST to the same place that it is actually USED :P Plus add comment explaining why it exists
---

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index c538b6f3e..3fb3ab636 100644
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -1,4 +1,3 @@
-#define WANT_CONST
 // commonly used, but better make them macros
 #define TRUE 1
 #define FALSE 0
diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index d33971238..4eb5164a8 100644
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -38,6 +38,7 @@ const float MAX_SHOT_DISTANCE = 32768;
 #define WR_ZOOMRETICLE    16 // (CLIENT) weapon specific zoom reticle
 
 // WEAPONTODO
+#define WANT_CONST /* we WANT these to be constant, but it conflicts with the declaration in dpdefs/progsdefs.qc */
 const float	IT_UNLIMITED_WEAPON_AMMO     = 1;
 // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup.
 const float	IT_UNLIMITED_SUPERWEAPONS    = 2;