Move WANT_CONST to the same place that it is actually USED :P Plus add comment explai...

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index c538b6f3e012a52eb527a74f1e3f7bee4ea96b1c..3fb3ab63671d3b066e00e0d9ebe9030e431ebc16 100644 (file)
--- 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 d33971238fcc64e350f4fd1cae95731f783b78f5..4eb5164a8a03fbfbae348d6c1a9e7fa7876b9ca4 100644 (file)
--- 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;