Rename ITEM_ArmorLarge to ITEM_ArmorBig

diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh
index 7946fb7b5d3cb651d074492e23687bf799b106a8..a8981e86dbffa095774754ef535b11ecbe16cb44 100644 (file)
--- a/qcsrc/common/items/item/armor.qh
+++ b/qcsrc/common/items/item/armor.qh
@@ -54,19 +54,19 @@ REGISTER_ITEM(ArmorMedium, Armor) {
 }
 
 #ifdef GAMEQC
-MODEL(ArmorLarge_ITEM, Item_Model("item_armor_big.md3"));
-SOUND(ArmorLarge, "misc/armor17_5");
+MODEL(ArmorBig_ITEM, Item_Model("item_armor_big.md3"));
+SOUND(ArmorBig, "misc/armor17_5");
 #endif
 
-REGISTER_ITEM(ArmorLarge, Armor) {
+REGISTER_ITEM(ArmorBig, Armor) {
 #ifdef GAMEQC
-    this.m_model                =   MDL_ArmorLarge_ITEM;
-    this.m_sound                =   SND_ArmorLarge;
+    this.m_model                =   MDL_ArmorBig_ITEM;
+    this.m_sound                =   SND_ArmorBig;
 #endif
     this.m_name                 =   "50 Armor";
     this.m_icon                 =   "armor";
     this.m_color                =   '0 1 0';
-    this.m_waypoint             =   _("Large armor");
+    this.m_waypoint             =   _("Big armor");
 #ifdef SVQC
     this.m_botvalue             =   20000; // FIXME: higher than BOT_PICKUP_RATING_HIGH?
     this.m_itemid               =   IT_ARMOR;

diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
index b76d22e95b51e5a1409a365159ab1e2261136c33..fbabd28c27f5ebc129bca25646209e84debb74d8 100644 (file)
--- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
+++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
@@ -59,7 +59,7 @@ int autocvar_hud_panel_itemstime_text = 1;
 bool Item_ItemsTime_SpectatorOnly(GameItem it)
 {
     return (false
-    || it == ITEM_ArmorMega     || (it == ITEM_ArmorLarge && !hud_panel_itemstime_hidelarge)
+    || it == ITEM_ArmorMega     || (it == ITEM_ArmorBig && !hud_panel_itemstime_hidelarge)
     || it == ITEM_HealthMega    || (it == ITEM_HealthLarge && !hud_panel_itemstime_hidelarge)
     );
 }

diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
index 39072cefc7d2ba0ab9697a9f3a104599b2a40dc9..a0224578b5ce693b3d0bd4df56aa0edbd235d38a 100644 (file)
--- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc
+++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
@@ -240,7 +240,7 @@ MUTATOR_HOOKFUNCTION(nix, FilterItem)
                case ITEM_HealthMega.m_itemid:
                case ITEM_ArmorSmall.m_itemid:
                case ITEM_ArmorMedium.m_itemid:
-               case ITEM_ArmorLarge.m_itemid:
+               case ITEM_ArmorBig.m_itemid:
                case ITEM_ArmorMega.m_itemid:
                        if (autocvar_g_nix_with_healtharmor)
                                return false;

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index cc5982840243baee3ee34c375b51b0494749dc98..5152e30724051227f72923c6a744411b5ea87e60 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -314,7 +314,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
                case ITEM_ArmorMedium: return autocvar_g_overkill_filter_armormedium;
                // WARNING: next two statements look wrong because of inconsistency between cvar names and code
                // armor cvars need renaming to be consistent with their health counterparts
-               case ITEM_ArmorLarge: return autocvar_g_overkill_filter_armorbig;
+               case ITEM_ArmorBig: return autocvar_g_overkill_filter_armorbig;
                case ITEM_ArmorMega: return autocvar_g_overkill_filter_armormega;
        }
 

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index dd521a7d91141a5b169e218e19d9a96ed52bb611..a0e9d638b6515b1b73502d6d7e89093b7bc90e59 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -1345,7 +1345,7 @@ spawnfunc(item_armor_big)
                this.max_armorvalue = g_pickup_armorbig_max;
        if(!this.pickup_anyway)
                this.pickup_anyway = g_pickup_armorbig_anyway;
-       StartItem(this, ITEM_ArmorLarge);
+       StartItem(this, ITEM_ArmorBig);
 }
 
 spawnfunc(item_armor_mega)