Merge branch 'master' into Mario/snake

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

diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index 9ff1bf4f6c0d07c6cb083080e2c7f754a9af4b11..eff0eff804ef1f07621f138f78f03266e8096a62 100644 (file)
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -107,9 +107,8 @@ const int STAT_HEALING_ORB_ALPHA      = 83;
 const int STAT_PLASMA                 = 84;
 const int STAT_OK_AMMO_CHARGE         = 85;
 const int STAT_OK_AMMO_CHARGEPOOL     = 86;
-const int STAT_CTF_FLAGSTATUS         = 87;
-const int STAT_FROZEN                 = 88;
-const int STAT_REVIVE_PROGRESS        = 89;
+const int STAT_FROZEN                 = 87;
+const int STAT_REVIVE_PROGRESS        = 88;
 // 89 empty?
 // 90 empty?
 // 91 empty?
@@ -120,8 +119,7 @@ const int STAT_REVIVE_PROGRESS        = 89;
 // 96 empty?
 // 97 empty?
 // 98 empty?
-// 99 empty?
-
+const int STAT_ROUNDLOST              = 99;
 
 /* The following stats change depending on the gamemode, so can share the same ID */
 // IDs 100 to 104 reserved for gamemodes
@@ -172,11 +170,11 @@ const int STAT_PL_CROUCH_MAX3         = 119;
 const int STAT_PL_CROUCH_VIEW_OFS1    = 117;
 const int STAT_PL_CROUCH_VIEW_OFS2    = 118;
 const int STAT_PL_CROUCH_VIEW_OFS3    = 119;
-// 120 empty?
-// 121 empty?
-// 122 empty?
-// 123 empty?
-// 124 empty?
+const int STAT_WEAPONSINMAP           = 120;
+const int STAT_WEAPONSINMAP2          = 121;
+const int STAT_WEAPONSINMAP3          = 122;
+const int STAT_BUFF_TIME              = 123;
+const int STAT_CTF_FLAGSTATUS         = 124;
 // 125 empty?
 // 126 empty?
 // 127 empty?
@@ -192,22 +190,22 @@ const int STAT_PL_CROUCH_VIEW_OFS3    = 119;
 // 137 empty?
 // 138 empty?
 // 139 empty?
-// 140 empty?
-// 141 empty?
-// 142 empty?
-// 143 empty?
-// 144 empty?
-// 145 empty?
-// 146 empty?
-// 147 empty?
-// 148 empty?
-// 149 empty?
-// 150 empty?
-// 151 empty?
-// 152 empty?
-// 153 empty?
-// 154 empty?
-// 155 empty?
+// 140 reserved
+// 141 reserved
+// 142 reserved
+// 143 reserved
+// 144 reserved
+// 145 reserved
+// 146 reserved
+// 147 reserved
+// 148 reserved
+// 149 reserved
+// 150 reserved
+// 151 reserved
+// 152 reserved
+// 153 reserved
+// 154 reserved
+// 155 reserved
 // 156 empty?
 // 157 empty?
 // 158 empty?
@@ -219,8 +217,8 @@ const int STAT_PL_CROUCH_VIEW_OFS3    = 119;
 // 163 empty?
 // 164 empty?
 // 165 empty?
-// 166 empty?
-// 167 empty?
+const int STAT_MULTIJUMP_DODGING                      = 166;
+const int STAT_MULTIJUMP_MAXSPEED                     = 167;
 const int STAT_GAMEPLAYFIX_UPVELOCITYCLEARSONGROUND   = 168;
 const int STAT_BUGRIGS_REVERSE_STOPPING               = 169;
 const int STAT_BUGRIGS_REVERSE_SPINNING               = 170;
@@ -247,8 +245,8 @@ const int STAT_GAMEPLAYFIX_EASIERWATERJUMP            = 190;
 const int STAT_MOVEVARS_FRICTION_SLICK                = 191;
 const int STAT_MOVEVARS_FRICTION_ONLAND               = 192;
 const int STAT_MOVEVARS_JUMPSPEEDCAP_DISABLE_ONRAMPS  = 193;
-const int STAT_MOVEVARS_JUMPSPEEDCAP_MAX              = 194;
-const int STAT_MOVEVARS_JUMPSPEEDCAP_MIN              = 195;
+// 194 empty?
+// 195 empty?
 const int STAT_DOUBLEJUMP                             = 196;
 const int STAT_MOVEVARS_TRACK_CANJUMP                 = 197;
 const int STAT_MULTIJUMP_ADD                          = 198;