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

Fixed Inventory::remove method

Browse Source
This commit is contained in:
Joshua Barretto 2019-07-25 13:46:54 +01:00
parent e557fabdeb
commit fde6ec35cd
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/comp/inventory/mod.rs
View File

@ -1,11 +1,11 @@
use specs::{Component, HashMapStorage};
use specs_idvs::IDVStorage;
//Re-Exports
pub mod item;
use item::Item;
use std::mem::swap;
// Reexports
pub use self::item::Item;
use specs::{Component, HashMapStorage};
use specs_idvs::IDVStorage;
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct Inventory {
@ -31,14 +31,8 @@ impl Inventory {
}
// Remove an item from the slot
pub fn remove(&mut self, cell: usize, item: Item) -> Option<Item> {
let mut tmp_item = Some(item);
if let Some(old_item) = self.slots.get_mut(cell) {
swap(old_item, &mut tmp_item);
}
tmp_item
pub fn remove(&mut self, cell: usize) -> Option<Item> {
self.slots.get_mut(cell).and_then(|item| item.take())
}
}