Merge branch 'master' into DefaultUser/armormega

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

diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh
index 79933870fc2b5535995dfec18d244e76cd0c5c69..bd2f61f15c3ceea03a4cec622be66a61b0adb3f6 100644 (file)
--- a/qcsrc/common/items/item/health.qh
+++ b/qcsrc/common/items/item/health.qh
@@ -13,13 +13,13 @@ ENDCLASS(Health)
     #include <common/t_items.qh>
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(HealthSmall_ITEM, Item_Model("g_h1.md3"));
 SOUND(HealthSmall, "misc/minihealth");
 #endif
 
 REGISTER_ITEM(HealthSmall, Health) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_HealthSmall_ITEM;
     this.m_sound                =   SND_HealthSmall;
 #endif
@@ -33,13 +33,13 @@ REGISTER_ITEM(HealthSmall, Health) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(HealthMedium_ITEM, Item_Model("g_h25.md3"));
 SOUND(HealthMedium, "misc/mediumhealth");
 #endif
 
 REGISTER_ITEM(HealthMedium, Health) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_HealthMedium_ITEM;
     this.m_sound                =   SND_HealthMedium;
 #endif
@@ -53,20 +53,20 @@ REGISTER_ITEM(HealthMedium, Health) {
 #endif
 }
 
-#ifndef MENUQC
-MODEL(HealthLarge_ITEM, Item_Model("g_h50.md3"));
-SOUND(HealthLarge, "misc/mediumhealth");
+#ifdef GAMEQC
+MODEL(HealthBig_ITEM, Item_Model("g_h50.md3"));
+SOUND(HealthBig, "misc/mediumhealth");
 #endif
 
-REGISTER_ITEM(HealthLarge, Health) {
-#ifndef MENUQC
-    this.m_model                =   MDL_HealthLarge_ITEM;
-    this.m_sound                =   SND_HealthLarge;
+REGISTER_ITEM(HealthBig, Health) {
+#ifdef GAMEQC
+    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;
@@ -75,13 +75,13 @@ REGISTER_ITEM(HealthLarge, Health) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(HealthMega_ITEM, Item_Model("g_h100.md3"));
 SOUND(HealthMega, "misc/megahealth");
 #endif
 
 REGISTER_ITEM(HealthMega, Health) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_HealthMega_ITEM;
     this.m_sound                =   SND_HealthMega;
 #endif
@@ -91,6 +91,7 @@ REGISTER_ITEM(HealthMega, Health) {
     this.m_waypoint             =   _("Mega health");
     this.m_waypointblink        =   2;
 #ifdef SVQC
+    this.m_maxs                 =   '16 16 70';
     this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
     this.m_itemid               =   IT_HEALTH;
     this.m_respawntime          =   GET(g_pickup_respawntime_long);