X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_melee_only.qc;h=019eeb8017af87f196e5c100a9fdb0f0f50e44c2;hp=c435aba0342c64e9c9fb3e238f2d5982772725d6;hb=c51698509e174e343dff48128a1dcfff1527c535;hpb=5d84c659e4c2c51c996b5330fa19c8a24887e42d

diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc
index c435aba03..019eeb801 100644
--- a/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@ -1,38 +1,41 @@
+
+#include "mutator.qh"
+
 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;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(melee_ForbidThrowing)
 {
-	return TRUE;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(melee_FilterItem)
-{
+{SELFPARAM();
 	switch (self.items)
 	{
-		case IT_5HP:
-		case IT_ARMOR_SHARD:
-			return FALSE;
+		case ITEM_HealthSmall.m_itemid:
+		case ITEM_ArmorSmall.m_itemid:
+			return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(melee_BuildMutatorsString)
 {
 	ret_string = strcat(ret_string, ":MeleeOnly");
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(melee_BuildMutatorsPrettyString)
 {
 	ret_string = strcat(ret_string, ", Melee Only Arena");
-	return FALSE;
+	return false;
 }
 
 MUTATOR_DEFINITION(mutator_melee_only)
@@ -43,5 +46,5 @@ MUTATOR_DEFINITION(mutator_melee_only)
 	MUTATOR_HOOK(BuildMutatorsString, melee_BuildMutatorsString, CBC_ORDER_ANY);
 	MUTATOR_HOOK(BuildMutatorsPrettyString, melee_BuildMutatorsPrettyString, CBC_ORDER_ANY);
 
-	return FALSE;
+	return false;
 }