X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_new_toys.qc;h=f11298451c8ea4df110710e5d3695f2a38693e1d;hb=0760ef00adc5171419b961c277c3f04feff5f379;hp=89ad13c5380775439b1a186e05ff93c81dba8141;hpb=0ee28e07a9b549802219bea01852416e7d622e60;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 89ad13c53..f11298451 100644
--- a/qcsrc/server/mutators/mutator_new_toys.qc
+++ b/qcsrc/server/mutators/mutator_new_toys.qc
@@ -4,7 +4,7 @@ CORE    laser   nex     lg      rl      cry     gl      elec    hagar   fireb
 									minsta  porto
 									tuba
 
-NEW             rifle   hlac    minel                           seeker   
+NEW             rifle   hlac    minel                           seeker
 IDEAS                                   OPEN    flak    OPEN            FUN FUN FUN FUN
 
 
@@ -110,7 +110,7 @@ string nt_GetReplacement(string w, float m)
 	if(m == NT_AUTOREPLACE_NEVER)
 		return w;
 	string s = nt_GetFullReplacement(w);
-	if not(s)
+	if (!s)
 		return w;
 	if(m == NT_AUTOREPLACE_RANDOM)
 		s = strcat(w, " ", s);
@@ -125,11 +125,11 @@ MUTATOR_HOOKFUNCTION(nt_SetStartItems)
 
 	float i, j, k, n;
 
-	WEPSET_DECLARE_A(newdefault);
-	WEPSET_DECLARE_A(warmup_newdefault);
-	
-	WEPSET_CLEAR_A(newdefault);
-	WEPSET_CLEAR_A(warmup_newdefault);
+	WepSet newdefault;
+	WepSet warmup_newdefault;
+
+	newdefault = '0 0 0';
+	warmup_newdefault = '0 0 0';
 
 	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 	{
@@ -143,20 +143,20 @@ MUTATOR_HOOKFUNCTION(nt_SetStartItems)
 			for(k = WEP_FIRST; k <= WEP_LAST; ++k)
 				if(get_weaponinfo(k).netname == argv(j))
 				{
-					if(WEPSET_CONTAINS_AW(start_weapons, i))
-						WEPSET_OR_AW(newdefault, k);
-					if(WEPSET_CONTAINS_AW(warmup_start_weapons, i))
-						WEPSET_OR_AW(warmup_newdefault, k);
+					if(start_weapons & WepSet_FromWeapon(i))
+						newdefault |= WepSet_FromWeapon(k);
+					if(warmup_start_weapons & WepSet_FromWeapon(i))
+						warmup_newdefault |= WepSet_FromWeapon(k);
 				}
 	}
 
-	WEPSET_AND_AA(newdefault, start_weapons_defaultmask);
-	WEPSET_ANDNOT_AA(start_weapons, start_weapons_defaultmask);
-	WEPSET_OR_AA(start_weapons, newdefault);
+	newdefault &= start_weapons_defaultmask;
+	start_weapons &= ~start_weapons_defaultmask;
+	start_weapons |= newdefault;
 
-	WEPSET_AND_AA(warmup_newdefault, warmup_start_weapons_defaultmask);
-	WEPSET_ANDNOT_AA(warmup_start_weapons, warmup_start_weapons_defaultmask);
-	WEPSET_OR_AA(warmup_start_weapons, warmup_newdefault);
+	warmup_newdefault &= warmup_start_weapons_defaultmask;
+	warmup_start_weapons &= ~warmup_start_weapons_defaultmask;
+	warmup_start_weapons |= warmup_newdefault;
 
 	return 0;
 }
@@ -206,7 +206,7 @@ MUTATOR_DEFINITION(mutator_new_toys)
 		float i;
 		for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 			if(nt_IsNewToy(i))
-				get_weaponinfo(i).spawnflags &~= WEP_FLAG_MUTATORBLOCKED;
+				get_weaponinfo(i).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
 	}
 
 	MUTATOR_ONROLLBACK_OR_REMOVE