From c0267a6a18843ce854daccc8b06beb50af0c1a49 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Wed, 7 Oct 2020 20:33:06 -0400 Subject: [PATCH] Update boo2 & use Keycode::ENTER in CNESEmulator --- NESEmulator/CNESEmulator.cpp | 2 +- boo2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NESEmulator/CNESEmulator.cpp b/NESEmulator/CNESEmulator.cpp index ec112e1a2..aa7516dc7 100644 --- a/NESEmulator/CNESEmulator.cpp +++ b/NESEmulator/CNESEmulator.cpp @@ -589,7 +589,7 @@ void CNESEmulator::ProcessUserInput(const CFinalInput& input, int) { if (GetPasswordEntryState() != EPasswordEntryState::NotPasswordScreen) { // Don't swap A/B - inValReads[BUTTON_A] = input.DA() || input.DSpecialKey(boo::ESpecialKey::Enter) || + inValReads[BUTTON_A] = input.DA() || input.DSpecialKey(boo2::Keycode::ENTER) || input.DMouseButton(boo2::MouseButton::Primary); inValReads[BUTTON_B] = input.DB() || input.DSpecialKey(boo2::Keycode::ESC); } else { diff --git a/boo2 b/boo2 index 1e4179322..f177cd5ef 160000 --- a/boo2 +++ b/boo2 @@ -1 +1 @@ -Subproject commit 1e4179322cb6245c6525d1201ce45aa6d93db554 +Subproject commit f177cd5efdbfc527b96832309dd485ab50cf4cca