- if (remaining & WepSet_FromWeapon(j)) RandomSelection_Add(world, j, string_null, 1, 1);
- result |= WepSet_FromWeapon(RandomSelection_chosen_float);
- remaining &= ~WepSet_FromWeapon(RandomSelection_chosen_float);
+ if (remaining & WepSet_FromWeapon(Weapons_from(j))) RandomSelection_Add(NULL, j, string_null, 1, 1);
+ Weapon w = Weapons_from(RandomSelection_chosen_float);
+ result |= WepSet_FromWeapon(w);
+ remaining &= ~WepSet_FromWeapon(w);