Merge remote branch 'origin/master' into samual/config_updates

[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 5976eb975eee0e3151deff590e4348916714e41a..1cd7d1f3ba2af45f40d605a2371ff98a267b162d 100644 (file)
--- a/qcsrc/client/csqc_constants.qc
+++ b/qcsrc/client/csqc_constants.qc
@@ -1,4 +1,4 @@
-const entity   NULL                                                    = world;
+#define world world
 
 // Mask Constants (set .drawmask on entities; use R_AddEntities to add all entities based on mask)
 const float            MASK_ENGINE                                             = 1;
@@ -64,18 +64,6 @@ const float          STAT_FRAGLIMIT                                  = 235;
 const float            STAT_TIMELIMIT                                  = 236;
 const float     STAT_MOVEVARS_GRAVITY           = 242;
 
-// Sound Constants
-//const float          CHAN_AUTO                                               = 0;
-//const float          CHAN_WEAPON                                             = 1;
-//const float          CHAN_VOICE                                              = 2;
-//const float          CHAN_ITEM                                               = 3;
-//const float          CHAN_BODY                                               = 4;
-
-//const float          ATTN_NONE                                               = 0;
-//const float          ATTN_NORM                                               = 1;
-//const float          ATTN_IDLE                                               = 2;
-//const float          ATTN_STATIC                                             = 3;
-
 // Quake-style Point Contents
 const float            CONTENT_EMPTY                                   = -1;
 const float            CONTENT_SOLID                                   = -2;
@@ -164,13 +152,6 @@ const float BUTTON_14 = 65536;
 const float BUTTON_15 = 131072;
 const float BUTTON_16 = 262144;
 
-const float DRAWFLAG_NORMAL = 0;
-const float DRAWFLAG_ADDITIVE = 1;
-const float DRAWFLAG_MODULATE = 2;
-const float DRAWFLAG_2XMODULATE = 3;
-const float DRAWFLAG_SCREEN = 4;
-const float DRAWFLAG_MIPMAP = 0x100; // only for R_BeginPolygon
-
 #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