const int ENT_CLIENT_MINIGAME = 75;
const int ENT_CLIENT_VIEWLOC = 78;
const int ENT_CLIENT_VIEWLOC_TRIGGER = 79;
-const int ENT_CLIENT_HEALING_ORB = 80;
const int ENT_CLIENT_MUTATOR = TE_CSQC_MUTATOR; // 99
const int SPRITERULE_TEAMPLAY = 1;
const int SPRITERULE_SPECTATOR = 2;
-const int RADARICON_NONE = 0;
-const int RADARICON_FLAG = 1;
-const int RADARICON_FLAGCARRIER = 1;
-const int RADARICON_HERE = 1; // TODO make these 3 and 4, and make images for them
-const int RADARICON_DANGER = 1;
-const int RADARICON_WAYPOINT = 1;
-const int RADARICON_HELPME = 1;
-const int RADARICON_CONTROLPOINT = 1;
-const int RADARICON_GENERATOR = 1;
-const int RADARICON_OBJECTIVE = 1;
-const int RADARICON_DOMPOINT = 1;
-const int RADARICON_POWERUP = 1;
-const int RADARICON_TAGGED = 1;
-
///////////////////////////
// keys pressed
-const int KEY_FORWARD = 1;
-const int KEY_BACKWARD = 2;
-const int KEY_LEFT = 4;
-const int KEY_RIGHT = 8;
-const int KEY_JUMP = 16;
-const int KEY_CROUCH = 32;
-const int KEY_ATCK = 64;
-const int KEY_ATCK2 = 128;
+const int KEY_FORWARD = BIT(0);
+const int KEY_BACKWARD = BIT(1);
+const int KEY_LEFT = BIT(2);
+const int KEY_RIGHT = BIT(3);
+const int KEY_JUMP = BIT(4);
+const int KEY_CROUCH = BIT(5);
+const int KEY_ATCK = BIT(6);
+const int KEY_ATCK2 = BIT(7);
///////////////////////////
// cvar constants
/**
* Lower scores are better (e.g. suicides)
*/
-const int SFL_LOWER_IS_BETTER = 1;
+const int SFL_LOWER_IS_BETTER = BIT(0);
/**
* Don't show zero values as scores
*/
-const int SFL_HIDE_ZERO = 2;
+const int SFL_HIDE_ZERO = BIT(1);
/**
* Allow a column to be hidden (do not automatically add it even if it is a sorting key)
*/
-const int SFL_ALLOW_HIDE = 16;
+const int SFL_ALLOW_HIDE = BIT(4);
/**
* Display as a rank (with st, nd, rd, th suffix)
*/
-const int SFL_RANK = 32;
+const int SFL_RANK = BIT(5);
/**
* Display as mm:ss.s, value is stored as 10ths of a second (AND 0 is the worst possible value!)
*/
-const int SFL_TIME = 64;
+const int SFL_TIME = BIT(6);
// not an extra constant yet
#define SFL_ZERO_IS_WORST SFL_TIME
/**
* Score indices
*/
-#define MAX_SCORE 10
+#define MAX_SCORE 12
#define MAX_TEAMSCORE 2
const int ST_SCORE = 0;
const int SP_DEATHS = 1;
const int SP_SUICIDES = 2;
const int SP_SCORE = 3;
+const int SP_DMG = 10;
+const int SP_DMGTAKEN = 11;
// game mode specific indices are not in common/, but in server/scores_rules.qc!
const int CH_INFO = 0;