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

Item use is now goes through a control action rather than a control event.

Browse Source
This commit is contained in:
Sam
2021-03-01 17:40:42 -05:00
parent 9ad8804b60
commit d02c61ad8a
15 changed files with 91 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ use crate::{
item::{Hands, ItemKind, Tool, ToolKind},
quadruped_low, quadruped_medium, quadruped_small,
skills::Skill,
theropod, Body, CharacterAbility, CharacterState, LoadoutManip, StateUpdate,
theropod, Body, CharacterAbility, CharacterState, InventoryAction, StateUpdate,
},
consts::{FRIC_GROUND, GRAVITY},
event::{LocalEvent, ServerEvent},
@ -395,12 +395,11 @@ pub fn attempt_swap_equipped_weapons(data: &JoinData, update: &mut StateUpdate)
pub fn handle_manipulate_loadout(
data: &JoinData,
update: &mut StateUpdate,
loadout_manip: LoadoutManip,
inv_action: InventoryAction,
) {
update.server_events.push_front(ServerEvent::InventoryManip(
data.entity,
loadout_manip.into(),
));
update
.server_events
.push_front(ServerEvent::InventoryManip(data.entity, inv_action.into()));
}
/// Checks that player can wield the glider and updates `CharacterState` if so