X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_pinata.qc;h=5dd6aa92e46e90b02aae2e1277f70460b9243db7;hp=e32c08a2db5f44c72898596d1d65739bd18177fe;hb=5b4d55a39e59f76751555cc0420e5734fbc4a792;hpb=129ac6d2e1c51e90e97c96085858bc586fb7ec24

diff --git a/qcsrc/server/mutators/mutator_pinata.qc b/qcsrc/server/mutators/mutator_pinata.qc
index e32c08a2d..5dd6aa92e 100644
--- a/qcsrc/server/mutators/mutator_pinata.qc
+++ b/qcsrc/server/mutators/mutator_pinata.qc
@@ -1,25 +1,29 @@
+#include "../_all.qh"
+
+#include "mutator.qh"
+
 MUTATOR_HOOKFUNCTION(pinata_PlayerDies)
 {
 	float j;
 	for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-	if(WEPSET_CONTAINS_EW(self, j))
+	if(self.weapons & WepSet_FromWeapon(j))
 	if(self.switchweapon != j)
 	if(W_IsWeaponThrowable(j))
-		W_ThrowNewWeapon(self, j, FALSE, self.origin + (self.mins + self.maxs) * 0.5, randomvec() * 175 + '0 0 325');
-		
-	return TRUE;
+		W_ThrowNewWeapon(self, j, false, self.origin + (self.mins + self.maxs) * 0.5, randomvec() * 175 + '0 0 325');
+
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(pinata_BuildMutatorsString)
 {
 	ret_string = strcat(ret_string, ":Pinata");
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(pinata_BuildMutatorsPrettyString)
 {
 	ret_string = strcat(ret_string, ", Piñata");
-	return FALSE;
+	return false;
 }
 
 MUTATOR_DEFINITION(mutator_pinata)
@@ -28,5 +32,5 @@ MUTATOR_DEFINITION(mutator_pinata)
 	MUTATOR_HOOK(BuildMutatorsString, pinata_BuildMutatorsString, CBC_ORDER_ANY);
 	MUTATOR_HOOK(BuildMutatorsPrettyString, pinata_BuildMutatorsPrettyString, CBC_ORDER_ANY);
 
-	return FALSE;
+	return false;
 }