Browse Source

properly handle an error that doesn't even occur at the moment

pull/42/head
jake 4 years ago
parent
commit
bbe22a305a
  1. 7
      src/ship/items/inventory.rs
  2. 2
      src/ship/items/manager.rs

7
src/ship/items/inventory.rs

@ -82,6 +82,11 @@ pub enum InventoryItemAddToError {
ExceedsCapacity, ExceedsCapacity,
} }
#[derive(Error, Debug, Clone)]
#[error("")]
pub enum InventoryAddError {
}
impl InventoryItem { impl InventoryItem {
pub fn entity_ids(&self) -> Vec<ItemEntityId> { pub fn entity_ids(&self) -> Vec<ItemEntityId> {
match self { match self {
@ -511,7 +516,7 @@ impl CharacterInventory {
.nth(0) .nth(0)
} }
pub fn add_item(&mut self, item: InventoryItem) -> Result<(), ()> { // TODO: errors
pub fn add_item(&mut self, item: InventoryItem) -> Result<(), InventoryAddError> { // TODO: errors
// TODO: check slot conflict? // TODO: check slot conflict?
self.items.push(item); self.items.push(item);
Ok(()) Ok(())

2
src/ship/items/manager.rs

@ -917,7 +917,7 @@ impl ItemManager {
entity_id: entity_id, entity_id: entity_id,
item_id: item_id, item_id: item_id,
item: ItemDetail::Weapon(weapon.clone()), item: ItemDetail::Weapon(weapon.clone()),
}));
}))?;
entity_gateway.set_character_inventory(&character.id, &inventory.as_inventory_entity(&character.id)).await?; entity_gateway.set_character_inventory(&character.id, &inventory.as_inventory_entity(&character.id)).await?;

Loading…
Cancel
Save