fix directionals and other common buttons being dropped from controller inputs when hotkeys overrode controller inputs
This commit is contained in:
parent
4a752f66b7
commit
68cd28c28a
|
@ -593,6 +593,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
case "Rewind":
|
case "Rewind":
|
||||||
case "Fast Forward":
|
case "Fast Forward":
|
||||||
case "Open RA Overlay":
|
case "Open RA Overlay":
|
||||||
|
return true;
|
||||||
case "RA Up":
|
case "RA Up":
|
||||||
case "RA Down":
|
case "RA Down":
|
||||||
case "RA Left":
|
case "RA Left":
|
||||||
|
@ -600,7 +601,8 @@ namespace BizHawk.Client.EmuHawk
|
||||||
case "RA Confirm":
|
case "RA Confirm":
|
||||||
case "RA Cancel":
|
case "RA Cancel":
|
||||||
case "RA Quit":
|
case "RA Quit":
|
||||||
return true;
|
// don't consider these keys outside of RAIntegration overlay being active
|
||||||
|
return RA is RAIntegration { OverlayActive: true };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -235,6 +235,8 @@ namespace BizHawk.Client.EmuHawk
|
||||||
_mainForm.EmuClient.BeforeQuickLoad += QuickLoadCallback;
|
_mainForm.EmuClient.BeforeQuickLoad += QuickLoadCallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool OverlayActive => RA.IsOverlayFullyVisible();
|
||||||
|
|
||||||
public override void Update()
|
public override void Update()
|
||||||
{
|
{
|
||||||
if (RA.HardcoreModeIsActive())
|
if (RA.HardcoreModeIsActive())
|
||||||
|
@ -247,7 +249,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
RA.SetPaused(true);
|
RA.SetPaused(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!RA.IsOverlayFullyVisible()) return;
|
if (!OverlayActive) return;
|
||||||
|
|
||||||
var ci = new RAInterface.ControllerInput
|
var ci = new RAInterface.ControllerInput
|
||||||
{
|
{
|
||||||
|
@ -263,6 +265,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
RA.NavigateOverlay(ref ci);
|
RA.NavigateOverlay(ref ci);
|
||||||
|
|
||||||
// todo: suppress user inputs with overlay active?
|
// todo: suppress user inputs with overlay active?
|
||||||
|
// cpp: well this happens now if hotkeys override controller inputs
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnFrameAdvance()
|
public override void OnFrameAdvance()
|
||||||
|
|
Loading…
Reference in New Issue