Merge branch 'master' into TimePath/debug_draw

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / constants.qh

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 254246bdff54a896477a214d96686f5dd4ffb9ce..b0878773463fd3c6575d93258d7525d4bc981f92 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -81,8 +81,9 @@ const int ENT_CLIENT_LASER = 8;
 const int ENT_CLIENT_NAGGER = 9; // flags [votecalledvote]
 const int ENT_CLIENT_RADARLINK = 11; // flags [startorigin] [endorigin] [startcolor+16*endcolor]
 const int ENT_CLIENT_PROJECTILE = 12;
-const int ENT_CLIENT_GIBSPLASH = 13;
+
 const int ENT_CLIENT_DAMAGEINFO = 14;
+
 const int ENT_CLIENT_INIT = 16;
 const int ENT_CLIENT_MAPVOTE = 17;
 const int ENT_CLIENT_CLIENTDATA = 18;
@@ -123,7 +124,7 @@ const int ENT_CLIENT_CORNER = 70;
 const int ENT_CLIENT_KEYLOCK = 71;
 const int ENT_CLIENT_GENERATOR = 72;
 const int ENT_CLIENT_CONTROLPOINT_ICON = 73;
-const int ENT_CLIENT_EFFECT = 74;
+
 const int ENT_CLIENT_MINIGAME = 75;
 const int ENT_CLIENT_VIEWLOC = 78;
 const int ENT_CLIENT_VIEWLOC_TRIGGER = 79;
@@ -204,7 +205,7 @@ const int SFL_SORT_PRIO_MASK = 12;
 /**
  * Score indices
  */
-#define MAX_SCORE 10
+#define MAX_SCORE 12
 #define MAX_TEAMSCORE 2
 
 const int ST_SCORE = 0;
@@ -212,6 +213,8 @@ const int SP_KILLS = 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;