X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_melee_only.qc;h=fb8aac419f881c97b3e453122c36ad7ebb77de76;hp=c435aba0342c64e9c9fb3e238f2d5982772725d6;hb=7bd8f8562a392fda3ac881b1fbe2a35a5ef0f5c8;hpb=0f3709f96ff607455d69dc4844e39a8ea0587675

diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc
index c435aba03..fb8aac419 100644
--- a/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@ -1,38 +1,42 @@
+#include "../_all.qh"
+
+#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 +47,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;
 }