diff --git a/src/ship/shops/armor.rs b/src/ship/shops/armor.rs index 83afca2..23baa46 100644 --- a/src/ship/shops/armor.rs +++ b/src/ship/shops/armor.rs @@ -90,20 +90,6 @@ impl ShopItem for ArmorShopItem { } } -// impl ArmorShopItem { -// pub fn armor_from_item(a: &Armor) -> ArmorShopItem { -// ArmorShopItem::Frame(a.armor, a.slots as usize) -// } - -// pub fn shield_from_item(s: &Shield) -> ArmorShopItem { -// ArmorShopItem::Barrier(s.shield) -// } - -// pub fn unit_from_item(u: &Unit) -> ArmorShopItem { -// ArmorShopItem::Unit(u.unit) -// } -// } - impl From<&Armor> for ArmorShopItem { fn from(armor: &Armor) -> ArmorShopItem { ArmorShopItem::Frame(armor.armor, armor.slots as usize) diff --git a/src/ship/shops/tool.rs b/src/ship/shops/tool.rs index 2a025c6..b5f9718 100644 --- a/src/ship/shops/tool.rs +++ b/src/ship/shops/tool.rs @@ -96,16 +96,6 @@ impl ShopItem for ToolShopItem { } } -// impl ToolShopItem { -// pub fn tool_from_item(t: &Tool) -> ToolShopItem { -// ToolShopItem::Tool(t.tool) -// } - -// pub fn tech_from_item(d: &TechniqueDisk) -> ToolShopItem { -// ToolShopItem::Tech(*d) -// } -// } - impl From<&Tool> for ToolShopItem { fn from(tool: &Tool) -> ToolShopItem { ToolShopItem::Tool(tool.tool)