Adjust item definition syntax

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

diff --git a/qcsrc/common/items/item/powerup.qc b/qcsrc/common/items/item/powerup.qc
index f10a97e54ff8770b2660ecad293f5cc70d0a67b0..86e3a7d66b88a2782ce4273f09fa73ef80c7db22 100644 (file)
--- a/qcsrc/common/items/item/powerup.qc
+++ b/qcsrc/common/items/item/powerup.qc
@@ -3,7 +3,7 @@
 
 #define WITH(it) this.m_##it;
 #define CONFIGURE(...) MAP(WITH, __VA_ARGS__)
-#define DEFINE(id, ...)                                                     \
+#define DEFINE(id)                                                          \
     REGISTER_ITEM(id, Ammo, LAMBDA(                                         \
         IF(SV, CONFIGURE                                                    \
         ,   botvalue            =   100000                                  \
@@ -11,29 +11,28 @@
         ,   respawntime         =         GET(g_pickup_respawntime_powerup) \
         ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_powerup) \
         )                                                                   \
-        UNWORDS(__VA_ARGS__)                                          \
     ))
 
-DEFINE(Strength
-    ,APPLY(CONFIGURE
+DEFINE(Strength) {
+    APPLY(CONFIGURE
     ,   model               =   "models/items/g_strength.md3"
     ,   sound               =   "misc/powerup.wav"
     ,   name                =   "Strength Powerup"
     )
-    ,IF(SV, CONFIGURE
+    IF(SV, CONFIGURE
     ,   itemid              =   IT_STRENGTH
     )
-)
-DEFINE(Shield
-    ,APPLY(CONFIGURE
+}
+DEFINE(Shield) {
+    APPLY(CONFIGURE
     ,   model               =   "models/items/g_invincible.md3"
     ,   sound               =   "misc/powerup_shield.wav"
     ,   name                =   "Shield"
     )
-    ,IF(SV, CONFIGURE
+    IF(SV, CONFIGURE
     ,   itemid              =   IT_INVINCIBLE
     )
-)
+}
 
 #undef WITH
 #undef CONFIGURE