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

Do that better, and add a TODO.

Browse Source
This commit is contained in:
Shane Handley 2020-03-02 03:40:12 +09:00
parent 5dbc9b3b84
commit 9b0f11bd89
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,14 +157,21 @@ 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, false, true) => Some(SfxEvent::Wield(kind)),
(true, false, false) => Some(SfxEvent::Unwield(kind)),
(false, true) => Some(SfxEvent::Wield(kind)),
(true, false) => Some(SfxEvent::Unwield(kind)),
_ => None,
} {
return wield_event;
// We don't want wield/unwield sfx when we begin and end rolling, because when
// the players rolls repeatedly they trigger too frequently
// @TODO maybe re-enable these when we have a solid way to cancel them in the
// above scenario
if current_event.action.is_roll() {
return None;
} else {
return wield_event;
}
}
}