Declare ints as ints

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / csqc_constants.qc

diff --git a/qcsrc/client/csqc_constants.qc b/qcsrc/client/csqc_constants.qc
index 4d966476f3eb91d7ac835c62994ac296f1d005ad..1794d6e42d73a08bdd0cc352f4fd774baa7fd912 100644 (file)
--- a/qcsrc/client/csqc_constants.qc
+++ b/qcsrc/client/csqc_constants.qc
@@ -1,5 +1,3 @@
-#define world world
-
 // Mask Constants (set .drawmask on entities; use R_AddEntities to add all entities based on mask)
 const float            MASK_ENGINE                                             = 1;
 const float            MASK_ENGINEVIEWMODELS                   = 2;
@@ -49,12 +47,6 @@ const float          CONTENT_SLIME                                   = -4;
 const float            CONTENT_LAVA                                    = -5;
 const float            CONTENT_SKY                                             = -6;
 
-// Boolean Constants
-const float            true                                                    = 1;
-const float            false                                                   = 0;
-const float    TRUE                                                    = 1;
-const float    FALSE                                                   = 0;
-
 // Vector / Hull Constants
 const vector   VEC_1                                                   = '1 1 1';
 const vector   VEC_0                                                   = '0 0 0';
@@ -129,12 +121,12 @@ const float BUTTON_14 = 65536;
 const float BUTTON_15 = 131072;
 const float BUTTON_16 = 262144;
 
-#define        SOLID_NOT                               0               // no interaction with other objects
-#define        SOLID_TRIGGER                   1               // touch on edge, but not blocking
-#define        SOLID_BBOX                              2               // touch on edge, block
-#define        SOLID_SLIDEBOX                  3               // touch on edge, but not an onground
-#define        SOLID_BSP                               4               // bsp clip, touch on edge, block
-#define        SOLID_CORPSE                    5               // same as SOLID_BBOX, except it behaves as SOLID_NOT against SOLID_SLIDEBOX objects (players/monsters)
+const float SOLID_NOT          = 0; // no interaction with other objects
+const float SOLID_TRIGGER      = 1; // touch on edge, but not blocking
+const float SOLID_BBOX                 = 2; // touch on edge, block
+const float SOLID_SLIDEBOX     = 3; // touch on edge, but not an onground
+const float SOLID_BSP          = 4; // bsp clip, touch on edge, block
+const float SOLID_CORPSE       = 5; // same as SOLID_BBOX, except it behaves as SOLID_NOT against SOLID_SLIDEBOX objects (players/monsters)
 
 const float MOVE_NORMAL = 0; // same as FALSE
 const float MOVE_NOMONSTERS = 1; // same as TRUE