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);
float i, j, k, n;
- WEPSET_DECLARE_A(newdefault);
- WEPSET_DECLARE_A(warmup_newdefault);
+ WepSet newdefault;
+ WepSet warmup_newdefault;
- WEPSET_CLEAR_A(newdefault);
- WEPSET_CLEAR_A(warmup_newdefault);
+ newdefault = '0 0 0';
+ warmup_newdefault = '0 0 0';
for(i = WEP_FIRST; i <= WEP_LAST; ++i)
{
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;
}
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;
}
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;
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