ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: Use a constant for the gamepad button deletion mask

Browse source 
Add Flags-Attribute to GamepadButtons enums.
This commit is contained in:
Chivalrik 2021-05-02 12:21:49 +02:00
parent 66d42a7cfd
commit d65f2c6cd9
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Game/ClientState/GamepadButtons.cs
View file

@ -1,10 +1,18 @@
namespace Dalamud.Game.ClientState using System;
namespace Dalamud.Game.ClientState
{ {
/// <summary> /// <summary>
/// Bitmask of the Button ushort used by the game. /// Bitmask of the Button ushort used by the game.
/// </summary> /// </summary>
[Flags]
public enum GamepadButtons : ushort public enum GamepadButtons : ushort
{ {
/// <summary>
/// No buttons pressed.
/// </summary>
None = 0,
/// <summary> /// <summary>
/// Digipad up. /// Digipad up.
/// </summary> /// </summary>

13
Dalamud/Game/ClientState/GamepadState.cs
View file

@ -228,12 +228,13 @@ namespace Dalamud.Game.ClientState
// `ButtonPressed` while ImGuiConfigFlags.NavEnableGamepad is set. // `ButtonPressed` while ImGuiConfigFlags.NavEnableGamepad is set.
// This is debatable. // This is debatable.
// ImGui itself does not care either way as it uses the Raw values and does its own state handling. // ImGui itself does not care either way as it uses the Raw values and does its own state handling.
input->ButtonsRaw &= (ushort)~GamepadButtons.L2; const ushort deletionMask = (ushort)(~GamepadButtons.L2
input->ButtonsRaw &= (ushort)~GamepadButtons.R2; & ~GamepadButtons.R2
input->ButtonsRaw &= (ushort)~GamepadButtons.DpadDown; & ~GamepadButtons.DpadDown
input->ButtonsRaw &= (ushort)~GamepadButtons.DpadLeft; & ~GamepadButtons.DpadLeft
input->ButtonsRaw &= (ushort)~GamepadButtons.DpadUp; & ~GamepadButtons.DpadUp
input->ButtonsRaw &= (ushort)~GamepadButtons.DpadRight; & ~GamepadButtons.DpadRight);
input->ButtonsRaw &= deletionMask;
input->ButtonsPressed = 0; input->ButtonsPressed = 0;
input->ButtonsReleased = 0; input->ButtonsReleased = 0;
input->ButtonsRepeat = 0; input->ButtonsRepeat = 0;