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 special case for equipping a weapon that is no longer needed.

Browse Source
This commit is contained in:
Sam 2021-05-15 15:15:52 -05:00
parent 5cc6168553
commit ad0c247838
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/comp/inventory/mod.rs
View File

@ -552,16 +552,7 @@ impl Inventory {
pub fn equip(&mut self, inv_slot: InvSlotId) -> Vec<Item> {
self.get(inv_slot)
.and_then(|item| self.loadout.get_slot_to_equip_into(item.kind()))
.map(|equip_slot| {
// Special case when equipping into active main hand - swap with active offhand
// first
if equip_slot == EquipSlot::ActiveMainhand {
self.loadout
.swap_slots(EquipSlot::ActiveMainhand, EquipSlot::InactiveMainhand);
}
self.swap_inventory_loadout(inv_slot, equip_slot)
})
.map(|equip_slot| self.swap_inventory_loadout(inv_slot, equip_slot))
.unwrap_or_else(Vec::new)
}
@ -731,7 +722,8 @@ impl Inventory {
})
.unwrap_or_default();
// If 2 1h weapons are equipped, and mainhand weapon removed, move offhand into mainhand
// If 2 1h weapons are equipped, and mainhand weapon removed, move offhand into
// mainhand
match equip_slot {
EquipSlot::ActiveMainhand => {
if self.loadout.equipped(EquipSlot::ActiveMainhand).is_none()