Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 12:58:33 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Combination.IsModifierDown querying one of its modifiers instead of all of them

Browse source
This commit is contained in:
Ell 2022-11-08 17:50:58 +01:00
parent 8bb62a2ce5
commit 5906278091
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -34,6 +34,7 @@ Fixes
- Fixed TokenizedString handling trailing spaces incorrectly in the last line of non-left aligned text
- Fixed some TokenizedString tokens starting with a line break not being split correctly
- Fixed InputHandler maintaining old input states when input types are toggled off
- Fixed Combination.IsModifierDown querying one of its modifiers instead of all of them
Removals
- Marked EnumHelper as obsolete due to its reimplementation in [DynamicEnums](https://www.nuget.org/packages/DynamicEnums)

20
MLEM/Input/Keybind.cs
View file

@ -406,35 +406,31 @@ namespace MLEM.Input {
}
/// <summary>
/// Returns whether this combination's modifier keys are currently down
/// Returns whether all of this combination's modifier keys are currently down.
/// </summary>
/// <param name="handler">The input handler to query the keys with</param>
/// <param name="gamepadIndex">The index of the gamepad to query, or -1 to query all gamepads</param>
/// <returns>Whether this combination's modifiers are down</returns>
public bool IsModifierDown(InputHandler handler, int gamepadIndex = -1) {
if (this.Modifiers.Length <= 0)
return true;
foreach (var modifier in this.Modifiers) {
if (handler.IsDown(modifier, gamepadIndex))
return true;
if (!handler.IsDown(modifier, gamepadIndex))
return false;
}
return false;
return true;
}
/// <summary>
/// Returns whether this combination's modifier keys were down in the last update call.
/// Returns whether all of this combination's modifier keys were down in the last update call.
/// </summary>
/// <param name="handler">The input handler to query the keys with</param>
/// <param name="gamepadIndex">The index of the gamepad to query, or -1 to query all gamepads</param>
/// <returns>Whether this combination's modifiers were down</returns>
public bool WasModifierDown(InputHandler handler, int gamepadIndex = -1) {
if (this.Modifiers.Length <= 0)
return true;
foreach (var modifier in this.Modifiers) {
if (handler.WasDown(modifier, gamepadIndex))
return true;
if (!handler.WasDown(modifier, gamepadIndex))
return false;
}
return false;
return true;
}
/// <summary>