Merge branch 'packer-/impure_team_cvars' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_instagib.qc

diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc
index 7f97ba131396de1711005ca39a9998059e396a51..161dba90deb0c68d22f65ee5e65b96d4cf87de33 100644 (file)
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@ -15,31 +15,31 @@ float instagib_respawntimejitter_ammo = 0;
 GETTER(float, instagib_respawntime_ammo)
 GETTER(float, instagib_respawntimejitter_ammo)
 
-REGISTER_ITEM(VaporizerCells, Pickup, MAP(IDENTITY
-    ,IF(ALL, CONFIGURE
+REGISTER_ITEM(VaporizerCells, Pickup, APPLY(UNWORDS
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/a_cells.md3"
-    ,  sound                           =       "misc/itempickup.wav"
+    ,   sound               =   "misc/itempickup.wav"
     ,   name                =   "Vaporizer Ammo"
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   100
     ,   itemid              =   IT_CELLS
-    ,   respawntime         =            GET(instagib_respawntime_ammo)
+    ,   respawntime         =         GET(instagib_respawntime_ammo)
     ,   respawntimejitter   =   GET(instagib_respawntimejitter_ammo)
     )
 ))
 
-REGISTER_ITEM(ExtraLife, Pickup, MAP(IDENTITY
-    ,IF(ALL, CONFIGURE
+REGISTER_ITEM(ExtraLife, Pickup, APPLY(UNWORDS
+    ,APPLY(CONFIGURE
     ,   model               =   "models/items/g_h100.md3"
-    ,  sound                           =       "misc/megahealth.wav"
+    ,   sound               =   "misc/megahealth.wav"
     ,   name                =   "Extralife"
     )
     ,IF(SV, CONFIGURE
     ,   botvalue            =   BOT_PICKUP_RATING_HIGH
-    ,  itemflags                       =       FL_POWERUP
+    ,   itemflags           =   FL_POWERUP
     ,   itemid              =   IT_NAILS
-    ,   respawntime         =            GET(g_pickup_respawntime_powerup)
+    ,   respawntime         =         GET(g_pickup_respawntime_powerup)
     ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_powerup)
     )
 ))