Merge branch 'terencehill/menu_registries' into 'master'

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

diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh
index d21923e258dc196ef15e80209e3fbfb230b9de63..95c9d81a019eba844499bb714ad40d23ff326d21 100644 (file)
--- a/qcsrc/common/items/item/pickup.qh
+++ b/qcsrc/common/items/item/pickup.qh
@@ -4,16 +4,26 @@
 PROPERTY(float, g_pickup_respawntime_weapon)
 PROPERTY(float, g_pickup_respawntime_superweapon)
 PROPERTY(float, g_pickup_respawntime_ammo)
-PROPERTY(float, g_pickup_respawntime_short)
-PROPERTY(float, g_pickup_respawntime_medium)
-PROPERTY(float, g_pickup_respawntime_long)
+PROPERTY(float, g_pickup_respawntime_armor_small)
+PROPERTY(float, g_pickup_respawntime_armor_medium)
+PROPERTY(float, g_pickup_respawntime_armor_big)
+PROPERTY(float, g_pickup_respawntime_armor_mega)
+PROPERTY(float, g_pickup_respawntime_health_small)
+PROPERTY(float, g_pickup_respawntime_health_medium)
+PROPERTY(float, g_pickup_respawntime_health_big)
+PROPERTY(float, g_pickup_respawntime_health_mega)
 PROPERTY(float, g_pickup_respawntime_powerup)
 PROPERTY(float, g_pickup_respawntimejitter_weapon)
 PROPERTY(float, g_pickup_respawntimejitter_superweapon)
 PROPERTY(float, g_pickup_respawntimejitter_ammo)
-PROPERTY(float, g_pickup_respawntimejitter_short)
-PROPERTY(float, g_pickup_respawntimejitter_medium)
-PROPERTY(float, g_pickup_respawntimejitter_long)
+PROPERTY(float, g_pickup_respawntimejitter_health_small)
+PROPERTY(float, g_pickup_respawntimejitter_health_medium)
+PROPERTY(float, g_pickup_respawntimejitter_health_big)
+PROPERTY(float, g_pickup_respawntimejitter_health_mega)
+PROPERTY(float, g_pickup_respawntimejitter_armor_small)
+PROPERTY(float, g_pickup_respawntimejitter_armor_medium)
+PROPERTY(float, g_pickup_respawntimejitter_armor_big)
+PROPERTY(float, g_pickup_respawntimejitter_armor_mega)
 PROPERTY(float, g_pickup_respawntimejitter_powerup)
 #endif
 
@@ -35,8 +45,8 @@ CLASS(Pickup, GameItem)
     }
     ATTRIB(Pickup, m_itemid, int, 0);
 #ifdef SVQC
-    ATTRIB(Pickup, m_mins, vector, '-16 -16 0');
-    ATTRIB(Pickup, m_maxs, vector, '16 16 48');
+    ATTRIB(Pickup, m_mins, vector, ITEM_D_MINS);
+    ATTRIB(Pickup, m_maxs, vector, ITEM_D_MAXS);
     ATTRIB(Pickup, m_botvalue, int, 0);
     ATTRIB(Pickup, m_itemflags, int, 0);
     float generic_pickupevalfunc(entity player, entity item);