Merge branch 'master' into terencehill/bot_AI_improvements

[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 9366bc4617622bfd0e6ad67e4bd826bcbea5a8e3..cad5a376e753d3cd18cfb997261ed37141072881 100644 (file)
--- a/qcsrc/common/items/item/health.qh
+++ b/qcsrc/common/items/item/health.qh
@@ -20,6 +20,15 @@ SOUND(HealthSmall, Item_Sound("minihealth"));
 #endif
 #ifdef SVQC
 PROPERTY(float, g_pickup_healthsmall_anyway);
+PROPERTY(int, g_pickup_healthsmall);
+PROPERTY(int, g_pickup_healthsmall_max);
+void item_healthsmall_init(entity item)
+{
+    if(!item.max_health)
+        item.max_health = g_pickup_healthsmall_max;
+    if(!item.health)
+        item.health = g_pickup_healthsmall;
+}
 #endif
 
 REGISTER_ITEM(HealthSmall, Health) {
@@ -27,6 +36,7 @@ REGISTER_ITEM(HealthSmall, Health) {
     this.m_model                =   MDL_HealthSmall_ITEM;
     this.m_sound                =   SND_HealthSmall;
 #endif
+    this.netname                =   "health_small";
     this.m_name                 =   "5 Health";
     this.m_icon                 =   "health";
 #ifdef SVQC
@@ -34,6 +44,7 @@ REGISTER_ITEM(HealthSmall, Health) {
     this.m_respawntime          =   GET(g_pickup_respawntime_short);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
     this.m_pickupanyway         =   GET(g_pickup_healthsmall_anyway);
+    this.m_iteminit             =   item_healthsmall_init;
 #endif
 }
 
@@ -43,6 +54,15 @@ SOUND(HealthMedium, Item_Sound("mediumhealth"));
 #endif
 #ifdef SVQC
 PROPERTY(float, g_pickup_healthmedium_anyway);
+PROPERTY(int, g_pickup_healthmedium);
+PROPERTY(int, g_pickup_healthmedium_max);
+void item_healthmedium_init(entity item)
+{
+    if(!item.max_health)
+        item.max_health = g_pickup_healthmedium_max;
+    if(!item.health)
+        item.health = g_pickup_healthmedium;
+}
 #endif
 
 REGISTER_ITEM(HealthMedium, Health) {
@@ -50,6 +70,7 @@ REGISTER_ITEM(HealthMedium, Health) {
     this.m_model                =   MDL_HealthMedium_ITEM;
     this.m_sound                =   SND_HealthMedium;
 #endif
+    this.netname                =   "health_medium";
     this.m_name                 =   "25 Health";
     this.m_icon                 =   "health";
 #ifdef SVQC
@@ -57,6 +78,7 @@ REGISTER_ITEM(HealthMedium, Health) {
     this.m_respawntime          =   GET(g_pickup_respawntime_short);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
     this.m_pickupanyway         =   GET(g_pickup_healthmedium_anyway);
+    this.m_iteminit             =   item_healthmedium_init;
 #endif
 }
 
@@ -66,6 +88,15 @@ SOUND(HealthBig, Item_Sound("mediumhealth"));
 #endif
 #ifdef SVQC
 PROPERTY(float, g_pickup_healthbig_anyway);
+PROPERTY(int, g_pickup_healthbig);
+PROPERTY(int, g_pickup_healthbig_max);
+void item_healthbig_init(entity item)
+{
+    if(!item.max_health)
+        item.max_health = g_pickup_healthbig_max;
+    if(!item.health)
+        item.health = g_pickup_healthbig;
+}
 #endif
 
 REGISTER_ITEM(HealthBig, Health) {
@@ -73,6 +104,7 @@ REGISTER_ITEM(HealthBig, Health) {
     this.m_model                =   MDL_HealthBig_ITEM;
     this.m_sound                =   SND_HealthBig;
 #endif
+    this.netname                =   "health_big";
     this.m_name                 =   "50 Health";
     this.m_icon                 =   "health";
     this.m_color                =   '1 0 0';
@@ -82,6 +114,7 @@ REGISTER_ITEM(HealthBig, Health) {
     this.m_respawntime          =   GET(g_pickup_respawntime_medium);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
     this.m_pickupanyway         =   GET(g_pickup_healthbig_anyway);
+    this.m_iteminit             =   item_healthbig_init;
 #endif
 }
 
@@ -91,6 +124,15 @@ SOUND(HealthMega, Item_Sound("megahealth"));
 #endif
 #ifdef SVQC
 PROPERTY(float, g_pickup_healthmega_anyway);
+PROPERTY(int, g_pickup_healthmega);
+PROPERTY(int, g_pickup_healthmega_max);
+void item_healthmega_init(entity item)
+{
+    if(!item.max_health)
+        item.max_health = g_pickup_healthmega_max;
+    if(!item.health)
+        item.health = g_pickup_healthmega;
+}
 #endif
 
 REGISTER_ITEM(HealthMega, Health) {
@@ -98,6 +140,7 @@ REGISTER_ITEM(HealthMega, Health) {
     this.m_model                =   MDL_HealthMega_ITEM;
     this.m_sound                =   SND_HealthMega;
 #endif
+    this.netname                =   "health_mega";
     this.m_name                 =   "100 Health";
     this.m_icon                 =   "item_mega_health";
     this.m_color                =   '1 0 0';
@@ -109,5 +152,6 @@ REGISTER_ITEM(HealthMega, Health) {
     this.m_respawntime          =   GET(g_pickup_respawntime_long);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
     this.m_pickupanyway         =   GET(g_pickup_healthmega_anyway);
+    this.m_iteminit             =   item_healthmega_init;
 #endif
 }