WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 06:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mac

Browse Source 
# Conflicts:
#	AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp
#	PortabilityLayer/MenuManager.cpp
This commit is contained in:
Phil Marell
2021-08-05 18:46:18 +10:00
parent f36a8da95f 82fe38dfc7
commit 83978d0397
40 changed files with 448 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
GpApp/Input.cpp
View File

@@ -370,7 +370,7 @@ void DoPause (void)
if ((isEscPauseKey && theKeys->IsSet(PL_KEY_SPECIAL(kEscape))) ||
(!isEscPauseKey && theKeys->IsSet(PL_KEY_SPECIAL(kTab))))
paused = false;
else if (theKeys->IsSet(PL_KEY_EITHER_SPECIAL(kControl)))
else if (theKeys->IsSet(PL_KEY_SHORTCUT))
DoCommandKey();
Delay(1, nullptr);
@@ -480,7 +480,7 @@ void DoHeliumEngaged (gliderPtr thisGlider)
#else
if (theKeys->IsSet(PL_KEY_EITHER_SPECIAL(kControl)))
if (theKeys->IsSet(PL_KEY_SHORTCUT))
DoCommandKey();
// Cheesy - Use touchscreen menu as quit
@@ -568,7 +568,7 @@ void GetInput (gliderPtr thisGlider)
{
const KeyDownStates *theKeys = PortabilityLayer::InputManager::GetInstance()->GetKeys();
if (theKeys->IsSet(PL_KEY_EITHER_SPECIAL(kControl)))
if (theKeys->IsSet(PL_KEY_SHORTCUT))
DoCommandKey();
}