ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify variable assignment

This commit is contained in:
Morilli 2024-08-22 13:34:39 +02:00
parent 17733e38f7
commit 2f5dfcea33
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1178,17 +1178,16 @@ namespace BizHawk.Client.EmuHawk
// zero 09-sep-2012 - all input is eligible for controller input. not sure why the above was done. // zero 09-sep-2012 - all input is eligible for controller input. not sure why the above was done.
// maybe because it doesn't make sense to me to bind hotkeys and controller inputs to the same keystrokes // maybe because it doesn't make sense to me to bind hotkeys and controller inputs to the same keystrokes
bool handled; bool handled = false;
switch (Config.InputHotkeyOverrideOptions) switch (Config.InputHotkeyOverrideOptions)
{ {
default: default:
case 0: // Both allowed case 0: // Both allowed
finalHostController.Receive(ie); finalHostController.Receive(ie);
handled = false;
if (ie.EventType is InputEventType.Press) if (ie.EventType is InputEventType.Press)
{ {
handled = triggers.Aggregate(handled, (current, trigger) => current | CheckHotkey(trigger)); handled = triggers.Aggregate(false, (current, trigger) => current | CheckHotkey(trigger));
} }
// hotkeys which aren't handled as actions get coalesced as pollable virtual client buttons // hotkeys which aren't handled as actions get coalesced as pollable virtual client buttons
@ -1203,7 +1202,6 @@ namespace BizHawk.Client.EmuHawk
// don't check hotkeys when any of the pressed keys are input // don't check hotkeys when any of the pressed keys are input
if (!ie.LogicalButton.ToString().Split('+').Any(activeControllerHasBinding)) if (!ie.LogicalButton.ToString().Split('+').Any(activeControllerHasBinding))
{ {
handled = false;
if (ie.EventType is InputEventType.Press) if (ie.EventType is InputEventType.Press)
{ {
handled = triggers.Aggregate(false, (current, trigger) => current | CheckHotkey(trigger)); handled = triggers.Aggregate(false, (current, trigger) => current | CheckHotkey(trigger));
@ -1218,7 +1216,6 @@ namespace BizHawk.Client.EmuHawk
break; break;
case 2: // Hotkeys override Input case 2: // Hotkeys override Input
handled = false;
if (ie.EventType is InputEventType.Press) if (ie.EventType is InputEventType.Press)
{ {
handled = triggers.Aggregate(false, (current, trigger) => current | CheckHotkey(trigger)); handled = triggers.Aggregate(false, (current, trigger) => current | CheckHotkey(trigger));