summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-08 16:36:08 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-08 16:36:08 +0200
commit7b9d8c5a1f8e7ab21b9b257d24a0639ede5d3882 (patch)
tree84ea68ec0f48683f007026b55f3ebf41998a6646 /src
parentmerge (diff)
parentMerge branch 'master' into miami (diff)
downloadre3-7b9d8c5a1f8e7ab21b9b257d24a0639ede5d3882.tar
re3-7b9d8c5a1f8e7ab21b9b257d24a0639ede5d3882.tar.gz
re3-7b9d8c5a1f8e7ab21b9b257d24a0639ede5d3882.tar.bz2
re3-7b9d8c5a1f8e7ab21b9b257d24a0639ede5d3882.tar.lz
re3-7b9d8c5a1f8e7ab21b9b257d24a0639ede5d3882.tar.xz
re3-7b9d8c5a1f8e7ab21b9b257d24a0639ede5d3882.tar.zst
re3-7b9d8c5a1f8e7ab21b9b257d24a0639ede5d3882.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/Script.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index e01743e2..319ba419 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -894,6 +894,11 @@ int CTheScripts::ScriptToLoad = 0;
int CTheScripts::OpenScript()
{
+ // glfwGetKey doesn't work because of CGame::Initialise is blocking
+ CPad::UpdatePads();
+ if (CPad::GetPad(0)->GetChar('G')) ScriptToLoad = 0;
+ if (CPad::GetPad(0)->GetChar('R')) ScriptToLoad = 1;
+ if (CPad::GetPad(0)->GetChar('D')) ScriptToLoad = 2;
CFileMgr::ChangeDir("\\");
switch (ScriptToLoad) {
case 0: return CFileMgr::OpenFile("DATA\\main.scm", "rb");