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

Merge branch 'angel/add-testing' into 'master'

Browse Source 
Expand on documentation

See merge request veloren/veloren!1097
This commit is contained in:
Forest Anderson 2020-06-20 01:47:49 +00:00
commit 525b84ff9d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/comp/inventory/slot.rs
View File

@ -130,7 +130,8 @@ fn loadout_replace(
}
}
/// Insert an item into a loadout
/// Insert an item into a loadout. If the specified slot is already occupied
/// the old item is returned.
#[must_use]
fn loadout_insert(
equip_slot: EquipSlot,
@ -201,7 +202,8 @@ fn swap_inventory_loadout(
}
}
/// Swap items in loadout.
/// Swap items in loadout. Does nothing if items are not compatible with their
/// new slots.
fn swap_loadout(slot_a: EquipSlot, slot_b: EquipSlot, loadout: &mut Loadout) {
// Ensure that the slots are not the same
if slot_a == slot_b {