Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed commented code

Browse Source
This commit is contained in:
Sam 2021-05-17 16:48:56 -05:00
parent 6974ab9199
commit 3a004d9d4c
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/src/comp/inventory/loadout.rs
View File

@ -290,17 +290,6 @@ impl Loadout {
/// If no slot is available the item is returned.
#[must_use = "Returned item will be lost if not used"]
pub(super) fn try_equip(&mut self, item: Item) -> Result<(), Item> {
/* if let Some(loadout_slot) = self
.slots
.iter_mut()
.find(|s| s.slot.is_none() && self.slot_can_hold(s.equip_slot, item.kind()))
{
loadout_slot.slot = Some(item);
Ok(())
} else {
Err(item)
} */
// TODO: Get XVar to see if there better way to handle mutability issues
let loadout_slot = self
.slots
.iter()
@ -328,15 +317,8 @@ impl Loadout {
equip_slot: EquipSlot,
item_kind: Option<&ItemKind>,
) -> bool {
// let weapon_compare_slots = match equip_slot {
// EquipSlot::ActiveMainhand | EquipSlot::ActiveOffhand => {
// Some((EquipSlot::ActiveMainhand, EquipSlot::ActiveOffhand))
// },
// EquipSlot::InactiveMainhand | EquipSlot::InactiveOffhand => {
// Some((EquipSlot::InactiveMainhand, EquipSlot::InactiveOffhand))
// },
// _ => None,
// };
// Disallow equipping incompatible weapon pairs (i.e a two-handed weapon and a
// one-handed weapon)
if !(match equip_slot {
EquipSlot::ActiveMainhand => Loadout::is_valid_weapon_pair(
item_kind,
@ -359,17 +341,6 @@ impl Loadout {
return false;
}
// Disallow equipping incompatible weapon pairs (i.e a two-handed weapon and a
// one-handed weapon)
// if let Some(weapon_compare_slots) = weapon_compare_slots {
// if !Loadout::is_valid_weapon_pair(
// self.equipped(weapon_compare_slots.0).map(|x| &x.kind),
// self.equipped(weapon_compare_slots.1).map(|x| &x.kind),
// ) {
// return false;
// }
// }
item_kind.map_or(true, |item_kind| equip_slot.can_hold(item_kind))
}