Merge branch 'drjaska/handicap' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item / health.qh

diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh
index a2664cc516b5bf0c6d7aeee46ec67e01509e6499..a028f28c33142b7a10136b015868ce05c2800bc0 100644 (file)
--- a/qcsrc/common/items/item/health.qh
+++ b/qcsrc/common/items/item/health.qh
@@ -3,8 +3,6 @@
 #include "pickup.qh"
 CLASS(Health, Pickup)
 #ifdef SVQC
-    ATTRIB(Health, m_mins, vector, '-16 -16 0');
-    ATTRIB(Health, m_maxs, vector, '16 16 48');
     ATTRIB(Health, m_pickupevalfunc, float(entity player, entity item), healtharmor_pickupevalfunc);
     ATTRIB(Health, m_botvalue, int, 5000);
 #endif
@@ -46,6 +44,8 @@ REGISTER_ITEM(HealthSmall, Health) {
         this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
+    this.m_mins                 =   ITEM_S_MINS;
+    this.m_maxs                 =   ITEM_S_MAXS;
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_health_small);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_health_small);
@@ -89,6 +89,8 @@ REGISTER_ITEM(HealthMedium, Health) {
         this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
+    this.m_mins                 =   ITEM_S_MINS;
+    this.m_maxs                 =   ITEM_S_MAXS;
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_health_medium);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_health_medium);
@@ -178,7 +180,7 @@ REGISTER_ITEM(HealthMega, Health) {
     this.m_waypoint             =   _("Mega health");
     this.m_waypointblink        =   2;
 #ifdef SVQC
-    this.m_maxs                 =   '16 16 70';
+    this.m_maxs                 =   ITEM_L_MAXS;
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_health_mega);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_health_mega);