X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_melee_only.qc;h=c435aba0342c64e9c9fb3e238f2d5982772725d6;hb=ffc8306348654f791a14dfb6ffe918083067244c;hp=33d0e27b6b64734daf57dc385cdce6d15a4c1399;hpb=1bee0bfd4cbbb160b775164f2723072474f66a62;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc
index 33d0e27b6..c435aba03 100644
--- a/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@ -1,14 +1,16 @@
 MUTATOR_HOOKFUNCTION(melee_SetStartItems)
 {
-	start_ammo_shells = 0;
-	warmup_start_ammo_shells = 0;
-	
-	start_weapons = WEPSET_SHOTGUN;
-	warmup_start_weapons = WEPSET_SHOTGUN;
-		
+	start_ammo_shells = warmup_start_ammo_shells = 0;
+	start_weapons = warmup_start_weapons = WEPSET_SHOTGUN;
+
 	return FALSE;
 }
 
+MUTATOR_HOOKFUNCTION(melee_ForbidThrowing)
+{
+	return TRUE;
+}
+
 MUTATOR_HOOKFUNCTION(melee_FilterItem)
 {
 	switch (self.items)
@@ -17,7 +19,7 @@ MUTATOR_HOOKFUNCTION(melee_FilterItem)
 		case IT_ARMOR_SHARD:
 			return FALSE;
 	}
-	
+
 	return TRUE;
 }
 
@@ -36,6 +38,7 @@ MUTATOR_HOOKFUNCTION(melee_BuildMutatorsPrettyString)
 MUTATOR_DEFINITION(mutator_melee_only)
 {
 	MUTATOR_HOOK(SetStartItems, melee_SetStartItems, CBC_ORDER_ANY);
+	MUTATOR_HOOK(ForbidThrowCurrentWeapon, melee_ForbidThrowing, CBC_ORDER_ANY);
 	MUTATOR_HOOK(FilterItem, melee_FilterItem, CBC_ORDER_ANY);
 	MUTATOR_HOOK(BuildMutatorsString, melee_BuildMutatorsString, CBC_ORDER_ANY);
 	MUTATOR_HOOK(BuildMutatorsPrettyString, melee_BuildMutatorsPrettyString, CBC_ORDER_ANY);