Merge branch 'terencehill/obsolete_cvars_removal' into 'master'

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

diff --git a/qcsrc/common/items/item/health.qc b/qcsrc/common/items/item/health.qc
index dded21951f8b255c312bc74897405b7603a99848..bb9d90eb44cdb9c2af8fc1d62cb54ec8665318a8 100644 (file)
--- a/qcsrc/common/items/item/health.qc
+++ b/qcsrc/common/items/item/health.qc
@@ -4,7 +4,7 @@
 #endif
 
 REGISTER_ITEM(HealthSmall, Health) {
-    this.m_model                =   "models/items/g_h1.md3";
+    this.m_model                =   "g_h1.md3";
     this.m_sound                =   "misc/minihealth.wav";
     this.m_name                 =   "5 Health";
     this.m_icon                 =   "health";
@@ -17,7 +17,7 @@ REGISTER_ITEM(HealthSmall, Health) {
 }
 
 REGISTER_ITEM(HealthMedium, Health) {
-    this.m_model                =   "models/items/g_h25.md3";
+    this.m_model                =   "g_h25.md3";
     this.m_sound                =   "misc/mediumhealth.wav";
     this.m_name                 =   "25 Health";
     this.m_icon                 =   "health";
@@ -30,10 +30,12 @@ REGISTER_ITEM(HealthMedium, Health) {
 }
 
 REGISTER_ITEM(HealthLarge, Health) {
-    this.m_model                =   "models/items/g_h50.md3";
+    this.m_model                =   "g_h50.md3";
     this.m_sound                =   "misc/mediumhealth.wav";
     this.m_name                 =   "50 Health";
     this.m_icon                 =   "health";
+    this.m_color                =   '1 0 0';
+    this.m_waypoint             =   _("Large health");
 #ifdef SVQC
     this.m_botvalue             =   BOT_PICKUP_RATING_MID;
     this.m_itemid               =   IT_25HP;
@@ -43,10 +45,13 @@ REGISTER_ITEM(HealthLarge, Health) {
 }
 
 REGISTER_ITEM(HealthMega, Health) {
-    this.m_model                =   "models/items/g_h100.md3";
+    this.m_model                =   "g_h100.md3";
     this.m_sound                =   "misc/megahealth.wav";
     this.m_name                 =   "100 Health";
     this.m_icon                 =   "item_mega_health";
+    this.m_color                =   '1 0 0';
+    this.m_waypoint             =   _("Mega health");
+    this.m_waypointblink        =   2;
 #ifdef SVQC
     this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
     this.m_itemid               =   IT_HEALTH;