Merge branch 'master' into TimePath/scrollpanel

[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 4867273a614799c8d266327edcb3bc33f7eb7a3c..49a34c1c8ee280f159139311ae4b245c91a23c4f 100644 (file)
--- a/qcsrc/common/items/item/health.qc
+++ b/qcsrc/common/items/item/health.qc
@@ -1,52 +1 @@
 #include "health.qh"
-#ifdef SVQC
-    #include "../../../server/t_items.qh"
-#endif
-
-REGISTER_ITEM(HealthSmall, Health) {
-    this.m_model                =   "models/items/g_h1.md3";
-    this.m_sound                =   "misc/minihealth.wav";
-    this.m_name                 =   "5 Health";
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
-    this.m_itemid               =   IT_5HP;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
-#endif
-}
-
-REGISTER_ITEM(HealthMedium, Health) {
-    this.m_model                =   "models/items/g_h25.md3";
-    this.m_sound                =   "misc/mediumhealth.wav";
-    this.m_name                 =   "25 Health";
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_MID;
-    this.m_itemid               =   IT_25HP;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
-#endif
-}
-
-REGISTER_ITEM(HealthLarge, Health) {
-    this.m_model                =   "models/items/g_h50.md3";
-    this.m_sound                =   "misc/mediumhealth.wav";
-    this.m_name                 =   "50 Health";
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_MID;
-    this.m_itemid               =   IT_25HP;
-    this.m_respawntime          =   GET(g_pickup_respawntime_medium);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
-#endif
-}
-
-REGISTER_ITEM(HealthMega, Health) {
-    this.m_model                =   "models/items/g_h100.md3";
-    this.m_sound                =   "misc/megahealth.wav";
-    this.m_name                 =   "100 Health";
-#ifdef SVQC
-    this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
-    this.m_itemid               =   IT_HEALTH;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
-#endif
-}