Merge branch 'master' into terencehill/itemstime

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

diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index b488df1cfd709edacf36401d42990adbd4f4ed93..7c915696d7f098a829cad61a803b8badfe5d6b3f 100644 (file)
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -109,19 +109,18 @@ const int STAT_OK_AMMO_CHARGE         = 85;
 const int STAT_OK_AMMO_CHARGEPOOL     = 86;
 const int STAT_FROZEN                 = 87;
 const int STAT_REVIVE_PROGRESS        = 88;
-// 89 empty?
-// 90 empty?
-// 91 empty?
-// 92 empty?
-// 93 empty?
-// 94 empty?
-// 95 empty?
-// 96 empty?
-// 97 empty?
-// 98 empty?
+const int STAT_ARMOR_LARGE_TIME       = 89;
+const int STAT_HEALTH_MEGA_TIME       = 90;
+const int STAT_INVISIBLE_TIME         = 91;
+const int STAT_SPEED_TIME             = 92;
+const int STAT_EXTRALIFE_TIME         = 93;
+const int STAT_STRENGTH_TIME          = 94;
+const int STAT_SHIELD_TIME            = 95;
+const int STAT_FUELREGEN_TIME         = 96;
+const int STAT_JETPACK_TIME           = 97;
+const int STAT_SUPERWEAPONS_TIME      = 98;
 // 99 empty?
 
-
 /* The following stats change depending on the gamemode, so can share the same ID */
 // IDs 100 to 104 reserved for gamemodes
 
@@ -171,10 +170,10 @@ 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?
+const int STAT_WEAPONSINMAP           = 120;
+const int STAT_WEAPONSINMAP2          = 121;
+const int STAT_WEAPONSINMAP3          = 122;
+const int STAT_CTF_FLAGSTATUS         = 123;
 // 124 empty?
 // 125 empty?
 // 126 empty?