diff options
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 536055fa..224f9089 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -2573,20 +2573,16 @@ void CTheScripts::Shutdown() int scriptToLoad = 0; const char *scriptfile = "main.scm"; -#ifdef _WIN32 -#include <Windows.h> -#endif int open_script() { - // glfwGetKey doesn't work because of CGame::Initialise is blocking -#ifdef _WIN32 - if (GetAsyncKeyState('G') & 0x8000) + // glfwGetKey doesn't work because of CGame::Initialise is blocking + CPad::UpdatePads(); + if (CPad::GetPad(0)->GetChar('G')) scriptToLoad = 0; - if (GetAsyncKeyState('R') & 0x8000) + if (CPad::GetPad(0)->GetChar('R')) scriptToLoad = 1; - if (GetAsyncKeyState('D') & 0x8000) + if (CPad::GetPad(0)->GetChar('D')) scriptToLoad = 2; -#endif switch (scriptToLoad) { case 0: scriptfile = "main.scm"; break; case 1: scriptfile = "freeroam_lcs.scm"; break; |