Replace `MAP(IDENTITY)` with `UNWORDS`

[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 2b4a84bcf13dc1a40e67b2871641ca135e684ee5..08b422de1efdfddcaef9badd716264813774bca5 100644 (file)
--- a/qcsrc/common/items/item/health.qc
+++ b/qcsrc/common/items/item/health.qc
@@ -1,61 +1,63 @@
 #include "health.qh"
-#include "../../../server/t_items.qh"
+#ifdef SVQC
+    #include "../../../server/t_items.qh"
+#endif
 
 #define WITH(it) this.m_##it;
 #define CONFIGURE(...) MAP(WITH, __VA_ARGS__)
-#define DEFINE(id, ...) REGISTER_ITEM(id, Health, MAP(IDENTITY, __VA_ARGS__))
+#define DEFINE(id, ...) REGISTER_ITEM(id, Health, UNWORDS(__VA_ARGS__))
 
 DEFINE(HealthSmall
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/g_h1.md3"
     ,   sound               =   "misc/minihealth.wav"
     ,   name                =   "5 Health"
-    ,   itemid              =   IT_5HP
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   BOT_PICKUP_RATING_LOW
+    ,   itemid              =   IT_5HP
     ,   respawntime         =         GET(g_pickup_respawntime_short)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_short)
     )
 )
 
 DEFINE(HealthMedium
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/g_h25.md3"
     ,   sound               =   "misc/mediumhealth.wav"
     ,   name                =   "25 Health"
-    ,   itemid              =   IT_25HP
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   BOT_PICKUP_RATING_MID
+    ,   itemid              =   IT_25HP
     ,   respawntime         =         GET(g_pickup_respawntime_short)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_short)
     )
 )
 
 DEFINE(HealthLarge
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/g_h50.md3"
     ,   sound               =   "misc/mediumhealth.wav"
     ,   name                =   "50 Health"
-    ,   itemid              =   IT_25HP
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   BOT_PICKUP_RATING_MID
+    ,   itemid              =   IT_25HP
     ,   respawntime         =         GET(g_pickup_respawntime_medium)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_medium)
     )
 )
 
 DEFINE(HealthMega
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/g_h100.md3"
     ,   sound               =   "misc/megahealth.wav"
     ,   name                =   "100 Health"
-    ,   itemid              =   IT_HEALTH
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   BOT_PICKUP_RATING_HIGH
+    ,   itemid              =   IT_HEALTH
     ,   respawntime         =         GET(g_pickup_respawntime_long)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_long)
     )