]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Rename ITEM_HealthLarge to ITEM_HealthBig
authorFreddy <schro.sb@gmail.com>
Sat, 5 Nov 2016 22:51:59 +0000 (23:51 +0100)
committerFreddy <schro.sb@gmail.com>
Sat, 5 Nov 2016 22:51:59 +0000 (23:51 +0100)
qcsrc/common/items/item/health.qh
qcsrc/common/mutators/mutator/itemstime/itemstime.qc
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/t_items.qc

index 1597ba605708d944d69b76b10429c0357f0aec91..0b5458a2abd6fcf2725419dd7327b1b22986c41d 100644 (file)
@@ -54,19 +54,19 @@ REGISTER_ITEM(HealthMedium, Health) {
 }
 
 #ifdef GAMEQC
-MODEL(HealthLarge_ITEM, Item_Model("g_h50.md3"));
-SOUND(HealthLarge, "misc/mediumhealth");
+MODEL(HealthBig_ITEM, Item_Model("g_h50.md3"));
+SOUND(HealthBig, "misc/mediumhealth");
 #endif
 
-REGISTER_ITEM(HealthLarge, Health) {
+REGISTER_ITEM(HealthBig, Health) {
 #ifdef GAMEQC
-    this.m_model                =   MDL_HealthLarge_ITEM;
-    this.m_sound                =   SND_HealthLarge;
+    this.m_model                =   MDL_HealthBig_ITEM;
+    this.m_sound                =   SND_HealthBig;
 #endif
     this.m_name                 =   "50 Health";
     this.m_icon                 =   "health";
     this.m_color                =   '1 0 0';
-    this.m_waypoint             =   _("Large health");
+    this.m_waypoint             =   _("Big health");
 #ifdef SVQC
     this.m_botvalue             =   BOT_PICKUP_RATING_MID;
     this.m_itemid               =   IT_25HP;
index fbabd28c27f5ebc129bca25646209e84debb74d8..bbc48d7d8532bcbe6a00fbb207e92151f5d86a04 100644 (file)
@@ -60,7 +60,7 @@ bool Item_ItemsTime_SpectatorOnly(GameItem it)
 {
     return (false
     || it == ITEM_ArmorMega     || (it == ITEM_ArmorBig && !hud_panel_itemstime_hidelarge)
-    || it == ITEM_HealthMega    || (it == ITEM_HealthLarge && !hud_panel_itemstime_hidelarge)
+    || it == ITEM_HealthMega    || (it == ITEM_HealthBig && !hud_panel_itemstime_hidelarge)
     );
 }
 
index a0224578b5ce693b3d0bd4df56aa0edbd235d38a..95e30823bab43c3d699d71ac9fd80035d7039d2a 100644 (file)
@@ -236,7 +236,7 @@ MUTATOR_HOOKFUNCTION(nix, FilterItem)
        {
                case ITEM_HealthSmall.m_itemid:
                case ITEM_HealthMedium.m_itemid:
-               case ITEM_HealthLarge.m_itemid:
+               case ITEM_HealthBig.m_itemid:
                case ITEM_HealthMega.m_itemid:
                case ITEM_ArmorSmall.m_itemid:
                case ITEM_ArmorMedium.m_itemid:
index b96747f35b3fed0edf2bd997d8a126a14ee6ee66..e37e52869c607f4e2a106ec61dc3573bb0b9981f 100644 (file)
@@ -1389,7 +1389,7 @@ spawnfunc(item_health_big)
                this.health = g_pickup_healthbig;
        if(!this.pickup_anyway)
                this.pickup_anyway = g_pickup_healthbig_anyway;
-       StartItem(this, ITEM_HealthLarge);
+       StartItem(this, ITEM_HealthBig);
 }
 
 spawnfunc(item_health_mega)