diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-07-11 09:23:59 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-07-11 09:23:59 +0200 |
| commit | 776d46aacbc9317cb05c0d45949b4e4a2d45d848 (patch) | |
| tree | 5ef3bfb77974917b7bbe47d50045f6b0f4768362 /src/control/Script.cpp | |
| parent | Merge remote-tracking branch 'upstream/lcs' into lcs (diff) | |
| parent | Merge remote-tracking branch 'origin/miami' into lcs (diff) | |
| download | re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.gz re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.bz2 re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.lz re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.xz re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.zst re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.zip | |
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 89877452..fbb7024c 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; |