From 5dbc9b3b840f5bc98a7d4841edf28af64f9a5e81 Mon Sep 17 00:00:00 2001 From: Shane Handley Date: Sun, 1 Mar 2020 21:51:45 +0900 Subject: [PATCH] Prevent playing wield/unwield sfx when the playing starts and ends rolling. --- voxygen/src/audio/sfx/event_mapper/movement/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs index 0b0294ecec..77c2067177 100644 --- a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs +++ b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs @@ -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;