X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_melee_only.qc;h=da6b1e84bd6689847ac7ae16f8ed6673c9387b66;hb=a5b077eb799e456094034cdc0dd0d5b5a7e1119e;hp=639bba507ce522f6e1eeebe4e33901da998e27dd;hpb=bfd9a6bc281daf500aeba8f10c6b00a855fb42ae;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 639bba507..da6b1e84b 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;
-	
-	WEPSET_COPY_AW(start_weapons, WEP_SHOTGUN);
-	WEPSET_COPY_AW(warmup_start_weapons, WEP_SHOTGUN);
-		
+	start_ammo_shells = warmup_start_ammo_shells = 0;
+	start_weapons = warmup_start_weapons = WEPSET_SHOCKWAVE;
+
 	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);