Separate health and armor item respawning timers

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

diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh
index f8cabaa0595f08bacfde5fbf9b14c5ffae0654d4..341dfec7fa01ce6437df2155108b64193badfa7e 100644 (file)
--- a/qcsrc/common/items/item/armor.qh
+++ b/qcsrc/common/items/item/armor.qh
@@ -43,12 +43,12 @@ REGISTER_ITEM(ArmorSmall, Armor) {
     this.m_icon                 =   "armor_small";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
+    this.m_respawntime          =   GET(g_pickup_respawntime_armor_small);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_armor_small);
     this.m_pickupanyway         =   GET(g_pickup_armorsmall_anyway);
     this.m_iteminit             =   item_armorsmall_init;
 #endif
@@ -85,12 +85,12 @@ REGISTER_ITEM(ArmorMedium, Armor) {
     this.m_icon                 =   "armor_medium";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_medium);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
+    this.m_respawntime          =   GET(g_pickup_respawntime_armor_medium);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_armor_medium);
     this.m_pickupanyway         =   GET(g_pickup_armormedium_anyway);
     this.m_iteminit             =   item_armormedium_init;
 #endif
@@ -127,14 +127,14 @@ REGISTER_ITEM(ArmorBig, Armor) {
     this.m_icon                 =   "armor_big";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
     this.m_color                =   '0 1 0';
     this.m_waypoint             =   _("Big armor");
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
+    this.m_respawntime          =   GET(g_pickup_respawntime_armor_big);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_armor_big);
     this.m_pickupanyway         =   GET(g_pickup_armorbig_anyway);
     this.m_iteminit             =   item_armorbig_init;
 #endif
@@ -171,7 +171,7 @@ REGISTER_ITEM(ArmorMega, Armor) {
     this.m_icon                 =   "armor_mega";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "item_large_armor"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "item_large_armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
     this.m_color                =   '0 1 0';
     this.m_waypoint             =   _("Mega armor");
@@ -179,8 +179,8 @@ REGISTER_ITEM(ArmorMega, Armor) {
 #ifdef SVQC
     this.m_maxs                 =   '16 16 70';
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
+    this.m_respawntime          =   GET(g_pickup_respawntime_armor_mega);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_armor_mega);
     this.m_pickupanyway         =   GET(g_pickup_armormega_anyway);
     this.m_iteminit             =   item_armormega_init;
 #endif