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 ae1830569f43b6bfa54612d8f665defe9ec823a2..dbe9a13901a86c25ce813146c00c0ba6d64d6f0a 100644 (file)
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -109,18 +109,17 @@ 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?
-const float STAT_ARMOR_LARGE_TIME       = 90;
-const float STAT_HEALTH_MEGA_TIME       = 91;
-const float STAT_INVISIBLE_TIME         = 92;
-const float STAT_SPEED_TIME             = 93;
-const float STAT_EXTRALIFE_TIME         = 94;
-const float STAT_STRENGTH_TIME          = 95;
-const float STAT_SHIELD_TIME            = 96;
-const float STAT_FUELREGEN_TIME         = 97;
-const float STAT_JETPACK_TIME           = 98;
-const float STAT_SUPERWEAPONS_TIME      = 99;
-
+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,7 +170,9 @@ 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?
+const int STAT_WEAPONSINMAP           = 120;
+const int STAT_WEAPONSINMAP2          = 121;
+const int STAT_WEAPONSINMAP3          = 122;
 // 121 empty?
 // 122 empty?
 // 123 empty?