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 'shandley/no-wield-sfx-rolling' into 'master'

Browse Source 
No wield/unwield sfx when rolling

Closes #507

See merge request veloren/veloren!830
This commit is contained in:
Forest Anderson 2020-03-01 19:45:05 +00:00
commit e89810e0a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
voxygen/src/audio/sfx/event_mapper/movement/mod.rs
View File

@ -157,10 +157,11 @@ impl MovementEventMapper {
{
if let Some(wield_event) = match (
previous_event.weapon_drawn,
current_event.action.is_roll(),
Self::has_weapon_drawn(current_event.action),
) {
(false, true) => Some(SfxEvent::Wield(kind)),
(true, false) => Some(SfxEvent::Unwield(kind)),
(false, false, true) => Some(SfxEvent::Wield(kind)),
(true, false, false) => Some(SfxEvent::Unwield(kind)),
_ => None,
} {
return wield_event;