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

Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common.

Browse Source
This commit is contained in:
Sam
2021-02-08 12:31:17 -05:00
parent f026aeb2dc
commit 1c83c5ee6f
14 changed files with 71 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/states/utils.rs
View File

@ -353,24 +353,22 @@ pub fn handle_climb(data: &JoinData, update: &mut StateUpdate) {
}
/// Checks that player can Swap Weapons and updates `Loadout` if so
pub fn attempt_swap_loadout(data: &JoinData, update: &mut StateUpdate) {
pub fn attempt_swap_equipped_weapons(data: &JoinData, update: &mut StateUpdate) {
if data.inventory.equipped(EquipSlot::Offhand).is_some() {
update.swap_loadout = true;
update.swap_equipped_weapons = true;
}
}
/// Handles inventory manipulations that affect the loadout
pub fn handle_modify_loadout(
pub fn handle_manipulate_loadout(
data: &JoinData,
update: &mut StateUpdate,
loadout_manip: Option<LoadoutManip>,
loadout_manip: LoadoutManip,
) {
if let Some(loadout_manip) = loadout_manip {
update.server_events.push_front(ServerEvent::InventoryManip(
data.entity,
loadout_manip.into(),
));
}
update.server_events.push_front(ServerEvent::InventoryManip(
data.entity,
loadout_manip.into(),
));
}
/// Checks that player can wield the glider and updates `CharacterState` if so