From: Freddy <schro.sb@gmail.com>
Date: Sat, 5 Nov 2016 22:51:59 +0000 (+0100)
Subject: Rename ITEM_HealthLarge to ITEM_HealthBig
X-Git-Tag: xonotic-v0.8.2~387^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a893f5c93d03f118833b0118fd9178ea6d6e0959;p=xonotic%2Fxonotic-data.pk3dir.git

Rename ITEM_HealthLarge to ITEM_HealthBig
---

diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh
index 1597ba605..0b5458a2a 100644
--- a/qcsrc/common/items/item/health.qh
+++ b/qcsrc/common/items/item/health.qh
@@ -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;
diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
index fbabd28c2..bbc48d7d8 100644
--- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
+++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
@@ -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)
     );
 }
 
diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
index a0224578b..95e30823b 100644
--- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc
+++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
@@ -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:
diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index b96747f35..e37e52869 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -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)