Replace `MAP(IDENTITY)` with `UNWORDS`

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

diff --git a/qcsrc/common/items/item/armor.qc b/qcsrc/common/items/item/armor.qc
index a5c52458cab73645d4acde4141f7009597cbe2b5..8fed098ac190f5b7229fb94a1961f8368ddd852b 100644 (file)
--- a/qcsrc/common/items/item/armor.qc
+++ b/qcsrc/common/items/item/armor.qc
@@ -1,61 +1,63 @@
 #include "armor.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, Armor, MAP(IDENTITY, __VA_ARGS__))
+#define DEFINE(id, ...) REGISTER_ITEM(id, Armor, UNWORDS(__VA_ARGS__))
 
 DEFINE(ArmorSmall
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/item_armor_small.md3"
     ,   sound               =   "misc/armor1.wav"
     ,   name                =   "5 Armor"
-    ,   itemid              =   IT_ARMOR_SHARD
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   BOT_PICKUP_RATING_LOW
+    ,   itemid              =   IT_ARMOR_SHARD
     ,   respawntime         =         GET(g_pickup_respawntime_short)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_short)
     )
 )
 
 DEFINE(ArmorMedium
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/item_armor_medium.md3"
     ,   sound               =   "misc/armor10.wav"
     ,   name                =   "25 Armor"
-    ,   itemid              =   IT_ARMOR
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   BOT_PICKUP_RATING_MID
+    ,   itemid              =   IT_ARMOR
     ,   respawntime         =         GET(g_pickup_respawntime_medium)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_medium)
     )
 )
 
 DEFINE(ArmorBig
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/item_armor_big.md3"
     ,   sound               =   "misc/armor17_5.wav"
     ,   name                =   "50 Armor"
-    ,   itemid              =   IT_ARMOR
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   20000 // FIXME: higher than BOT_PICKUP_RATING_HIGH?
+    ,   itemid              =   IT_ARMOR
     ,   respawntime         =         GET(g_pickup_respawntime_long)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_long)
     )
 )
 
 DEFINE(ArmorLarge
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/item_armor_large.md3"
     ,   sound               =   "misc/armor25.wav"
     ,   name                =   "100 Armor"
-    ,   itemid              =   IT_ARMOR
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   BOT_PICKUP_RATING_HIGH
+    ,   itemid              =   IT_ARMOR
     ,   respawntime         =         GET(g_pickup_respawntime_long)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_long)
     )