X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_melee_only.qc;h=b4f9c37716c39c70426d05b5039a4735f84c37e8;hb=e7f4a20c1ea72fa73d07c1c95ec4fb2f6cee900c;hp=93e6edb5f24e4f1deae45332ffc1b44f0bf891db;hpb=b38e2bae0a50554f26bf5af1fbd0e70b97cc0c71;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 93e6edb5f..b4f9c3771 100644
--- a/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@ -1,12 +1,14 @@
 MUTATOR_HOOKFUNCTION(melee_SetStartItems)
 {
-	start_ammo_shells = 0;
-	warmup_start_ammo_shells = 0;
+	start_ammo_shells = warmup_start_ammo_shells = 0;
+	start_weapons = warmup_start_weapons = WEPSET_SHOTGUN;
 
-	start_weapons = WEPSET_SHOCKWAVE;
-	warmup_start_weapons = WEPSET_SHOCKWAVE;
+	return false;
+}
 
-	return FALSE;
+MUTATOR_HOOKFUNCTION(melee_ForbidThrowing)
+{
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(melee_FilterItem)
@@ -15,30 +17,31 @@ MUTATOR_HOOKFUNCTION(melee_FilterItem)
 	{
 		case IT_5HP:
 		case IT_ARMOR_SHARD:
-			return FALSE;
+			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)
 {
 	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);
 
-	return FALSE;
+	return false;
 }