summaryrefslogtreecommitdiff
path: root/src/playerstate.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-05-12 21:51:37 +0200
committertroido <troido@protonmail.com>2020-05-12 21:51:37 +0200
commit1b380b31f50035f10f651e220effe8a2970c0fd5 (patch)
tree5a25b839a4ee70ba96f7f096161ea59c08842492 /src/playerstate.rs
parent6c5b15758fbceef7987b40ee50a71ddc9624372d (diff)
removed 'substitute' part of encyclopedia
Diffstat (limited to 'src/playerstate.rs')
-rw-r--r--src/playerstate.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/playerstate.rs b/src/playerstate.rs
index 778fc7f..f9f6a4e 100644
--- a/src/playerstate.rs
+++ b/src/playerstate.rs
@@ -164,9 +164,8 @@ impl PlayerState {
ComponentWrapper::Player(Player::new(self.id.clone())),
ComponentWrapper::Inventory(Inventory{
items: self.inventory.iter().map( |(itemid, is_equipped)| {
- let id = encyclopedia.substitute_item(itemid);
- let item = encyclopedia.get_item(&id).ok_or(aerr!("failed to load item '{:?} in inventory of player {:?}", itemid, self))?;
- Ok(InventoryEntry{itemid: id, item, is_equipped: *is_equipped})
+ let item = encyclopedia.get_item(&itemid).ok_or(aerr!("failed to load item '{:?} in inventory of player {:?}", itemid, self))?;
+ Ok(InventoryEntry{itemid: itemid.clone(), item, is_equipped: *is_equipped})
}).collect::<Result<Vec<InventoryEntry>>>()?,
capacity: self.inventory_capacity
}),