Merge branch 'master' into terencehill/itemstime

[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 7270664d41f61504b98a7c50dcf782ef75c2e06c..f10a97e54ff8770b2660ecad293f5cc70d0a67b0 100644 (file)
--- a/qcsrc/common/items/item/powerup.qc
+++ b/qcsrc/common/items/item/powerup.qc
@@ -11,22 +11,26 @@
         ,   respawntime         =         GET(g_pickup_respawntime_powerup) \
         ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_powerup) \
         )                                                                   \
-        MAP(IDENTITY, __VA_ARGS__)                                          \
+        UNWORDS(__VA_ARGS__)                                          \
     ))
 
 DEFINE(Strength
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/g_strength.md3"
     ,   sound               =   "misc/powerup.wav"
     ,   name                =   "Strength Powerup"
+    )
+    ,IF(SV, CONFIGURE
     ,   itemid              =   IT_STRENGTH
     )
 )
 DEFINE(Shield
-    ,IF(ALL, CONFIGURE
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/g_invincible.md3"
     ,   sound               =   "misc/powerup_shield.wav"
     ,   name                =   "Shield"
+    )
+    ,IF(SV, CONFIGURE
     ,   itemid              =   IT_INVINCIBLE
     )
 )