diff options
| author | troido <troido@protonmail.com> | 2020-03-05 14:47:48 +0100 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-03-05 14:47:48 +0100 |
| commit | a520382eb19e4234ed52fd1eb9fb965b5967d522 (patch) | |
| tree | 5b4a8831cd544f57c6119eac5785973dc9e9bd50 /src/room.rs | |
| parent | 7846b871f5c9d57a19dbf09b7acbf0d6b38a69ca (diff) | |
equipment is now a part of the inventory
Diffstat (limited to 'src/room.rs')
| -rw-r--r-- | src/room.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/room.rs b/src/room.rs index 44882cf..0d83012 100644 --- a/src/room.rs +++ b/src/room.rs @@ -31,8 +31,7 @@ use crate::{ Inventory, Health, New, - Removed, - Equipment + Removed }, Encyclopedia, roomtemplate::RoomTemplate, @@ -223,13 +222,12 @@ impl <'a, 'b>Room<'a, 'b> { let players = self.world.read_component::<Player>(); let inventories = self.world.read_component::<Inventory>(); let healths = self.world.read_component::<Health>(); - let equipments = self.world.read_component::<Equipment>(); let mut saved = HashMap::new(); - for (player, inventory, health, equipment) in (&players, &inventories, &healths, &equipments).join() { + for (player, inventory, health) in (&players, &inventories, &healths).join() { saved.insert(player.id.clone(), PlayerState::create( player.id.clone(), self.id.clone(), - inventory.items.iter().map(|item| item.ent.clone()).collect(), + inventory.items.iter().map(|(item, _)| item.ent.clone()).collect(), inventory.capacity, health.health, health.maxhealth, @@ -246,12 +244,10 @@ impl <'a, 'b>Room<'a, 'b> { let inventory = inventories.get(ent)?; let healths = self.world.read_component::<Health>(); let health = healths.get(ent)?; - let equipments = self.world.read_component::<Equipment>(); - let equipment = equipments.get(ent)?; Some(PlayerState::create( player.id.clone(), self.id.clone(), - inventory.items.iter().map(|item| item.ent.clone()).collect(), + inventory.items.iter().map(|(item, _)| item.ent.clone()).collect(), inventory.capacity, health.health, health.maxhealth, |