X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_new_toys.qc;h=89ad13c5380775439b1a186e05ff93c81dba8141;hb=635a3c9a8a5c60e09e9449bf53128393d3355f20;hp=cc4f94324b8273fadf9fbc113c4dc286c6b8066b;hpb=834876e6b179cf33ce95102ba25faf754e9a8773;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_new_toys.qc b/qcsrc/server/mutators/mutator_new_toys.qc
index cc4f94324..89ad13c53 100644
--- a/qcsrc/server/mutators/mutator_new_toys.qc
+++ b/qcsrc/server/mutators/mutator_new_toys.qc
@@ -184,7 +184,7 @@ MUTATOR_HOOKFUNCTION(nt_SetWeaponreplace)
 MUTATOR_HOOKFUNCTION(nt_FilterItem)
 {
 	if(nt_IsNewToy(self.weapon))
-		self.item_pickupsound = "weapons/weaponpickup_new_toys.ogg";
+		self.item_pickupsound = "weapons/weaponpickup_new_toys.wav";
 	return 0;
 }
 
@@ -200,7 +200,7 @@ MUTATOR_DEFINITION(mutator_new_toys)
 		if(time > 1) // game loads at time 1
 			error("This cannot be added at runtime\n");
 
-		precache_sound("weapons/weaponpickup_new_toys.ogg");
+		precache_sound("weapons/weaponpickup_new_toys.wav");
 
 		// mark the guns as ok to use by e.g. impulse 99
 		float i;
@@ -208,9 +208,19 @@ MUTATOR_DEFINITION(mutator_new_toys)
 			if(nt_IsNewToy(i))
 				get_weaponinfo(i).spawnflags &~= WEP_FLAG_MUTATORBLOCKED;
 	}
+
+	MUTATOR_ONROLLBACK_OR_REMOVE
+	{
+		float i;
+		for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+			if(nt_IsNewToy(i))
+				get_weaponinfo(i).spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+	}
+
 	MUTATOR_ONREMOVE
 	{
-		error("This cannot be removed at runtime\n");
+		print("This cannot be removed at runtime\n");
+		return -1;
 	}
 
 	return 0;