Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Nikolay Korolev 2020-11-30 02:15:35 +03:00
commit a3b83a5d2f
2 changed files with 11 additions and 0 deletions

View file

@ -4157,12 +4157,22 @@ CMenuManager::ProcessButtonPresses(void)
DoSettingsBeforeStartingAGame();
return;
}
if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_D) == GLFW_PRESS) {
scriptToLoad = 2;
DoSettingsBeforeStartingAGame();
return;
}
#elif defined _WIN32
if (GetAsyncKeyState('R') & 0x8000) {
scriptToLoad = 1;
DoSettingsBeforeStartingAGame();
return;
}
if (GetAsyncKeyState('D') & 0x8000) {
scriptToLoad = 2;
DoSettingsBeforeStartingAGame();
return;
}
#endif
}
#endif