Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address MR 2062 comments: avoid an expect-equivalent pattern.

Browse Source
This commit is contained in:
Avi Weinstock 2021-04-05 10:37:51 -04:00
parent a1cfd9ea3c
commit 56137aff92
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/comp/inventory/loadout_builder.rs
View File

@ -599,15 +599,12 @@ impl LoadoutBuilder {
let mut item_with_amount = |item_id: &str, amount: &mut f32| {
if *amount > 0.0 {
let mut item = Item::new_from_asset_expect(&item_id);
if *amount > 1.0 && item.is_stackable() {
let n = rng.gen_range(0..amount.min(100.0) as u32).max(1);
item.set_amount(n).unwrap_or_else(|_| {
panic!("{} should be stackable (n={})", item_id, n)
});
*amount -= n as f32;
let n = rng.gen_range(0..amount.min(100.0) as u32).max(1);
*amount -= if item.set_amount(n).is_ok() {
n as f32
} else {
*amount -= 1.0;
}
1.0
};
Some(item)
} else {
None