the clip has spoken #42

Merged
jake merged 25 commits from clippylint into master 2021-06-19 02:48:25 -04:00
2 changed files with 7 additions and 2 deletions
Showing only changes of commit bbe22a305a - Show all commits

View File

@ -82,6 +82,11 @@ pub enum InventoryItemAddToError {
ExceedsCapacity,
}
#[derive(Error, Debug, Clone)]
#[error("")]
pub enum InventoryAddError {
}
impl InventoryItem {
pub fn entity_ids(&self) -> Vec<ItemEntityId> {
match self {
@ -511,7 +516,7 @@ impl CharacterInventory {
.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?
self.items.push(item);
Ok(())

View File

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