Reduce name space of resource constants and variables (RESOURCE_* --> RES_*, resour...

[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 2ecd8355714c950f1089cc7d03bbcbc1c8a2850a..399dc05b0b4acfc939b52817d8d9a50ab49bad23 100644 (file)
--- a/qcsrc/common/items/item/armor.qh
+++ b/qcsrc/common/items/item/armor.qh
@@ -26,8 +26,8 @@ void item_armorsmall_init(Pickup this, entity item)
 {
     if(!item.max_armorvalue)
         item.max_armorvalue = g_pickup_armorsmall_max;
-    if(!GetResourceAmount(item, RESOURCE_ARMOR))
-        SetResourceAmountExplicit(item, RESOURCE_ARMOR, g_pickup_armorsmall);
+    if(!GetResourceAmount(item, RES_ARMOR))
+        SetResourceAmount(item, RES_ARMOR, g_pickup_armorsmall);
 }
 #endif
 
@@ -64,8 +64,8 @@ void item_armormedium_init(Pickup this, entity item)
 {
     if(!item.max_armorvalue)
         item.max_armorvalue = g_pickup_armormedium_max;
-    if(!GetResourceAmount(item, RESOURCE_ARMOR))
-        SetResourceAmountExplicit(item, RESOURCE_ARMOR, g_pickup_armormedium);
+    if(!GetResourceAmount(item, RES_ARMOR))
+        SetResourceAmount(item, RES_ARMOR, g_pickup_armormedium);
 }
 #endif
 
@@ -102,8 +102,8 @@ void item_armorbig_init(Pickup this, entity item)
 {
     if(!item.max_armorvalue)
         item.max_armorvalue = g_pickup_armorbig_max;
-    if(!GetResourceAmount(item, RESOURCE_ARMOR))
-        SetResourceAmountExplicit(item, RESOURCE_ARMOR, g_pickup_armorbig);
+    if(!GetResourceAmount(item, RES_ARMOR))
+        SetResourceAmount(item, RES_ARMOR, g_pickup_armorbig);
 }
 #endif
 
@@ -142,8 +142,8 @@ void item_armormega_init(Pickup this, entity item)
 {
     if(!item.max_armorvalue)
         item.max_armorvalue = g_pickup_armormega_max;
-    if(!GetResourceAmount(item, RESOURCE_ARMOR))
-        SetResourceAmountExplicit(item, RESOURCE_ARMOR, g_pickup_armormega);
+    if(!GetResourceAmount(item, RES_ARMOR))
+        SetResourceAmount(item, RES_ARMOR, g_pickup_armormega);
 }
 #endif