Merge branch 'master' into TimePath/unified_weapons

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

diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc
index c77bba51630a59378bbfe02a0714d7ce32413391..fb8aac419f881c97b3e453122c36ad7ebb77de76 100644 (file)
--- a/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@ -5,7 +5,7 @@
 MUTATOR_HOOKFUNCTION(melee_SetStartItems)
 {
        start_ammo_shells = warmup_start_ammo_shells = 0;
-       start_weapons = warmup_start_weapons = WEPSET_SHOTGUN;
+       start_weapons = warmup_start_weapons = WEPSET(SHOTGUN);
 
        return false;
 }
@@ -16,7 +16,7 @@ MUTATOR_HOOKFUNCTION(melee_ForbidThrowing)
 }
 
 MUTATOR_HOOKFUNCTION(melee_FilterItem)
-{
+{SELFPARAM();
        switch (self.items)
        {
                case ITEM_HealthSmall.m_itemid: