From 35dd465c19b2fa0f00bd49ca921d19ec8f2dcf19 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sun, 8 Aug 2021 17:41:35 +0300 Subject: [PATCH 1/2] Revert "small fix" This reverts commit bd9658443381d91dd0bb1ded544617f2f0e3f1e0. --- src/control/Script.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 77d571d0..4501c27f 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -502,11 +502,6 @@ 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"); @@ -530,6 +525,12 @@ void CTheScripts::Init() UpsideDownCars.Init(); StuckCars.Init(); #ifdef USE_DEBUG_SCRIPT_LOADER + // 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; + int mainf = OpenScript(); #else CFileMgr::SetDir("data"); From 4673f509f6b6e73af93cbf55d2842f289f1a6765 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sun, 8 Aug 2021 17:42:32 +0300 Subject: [PATCH 2/2] Revert "small fix" This reverts commit bd9658443381d91dd0bb1ded544617f2f0e3f1e0. --- src/control/Script.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 0e8af1d5..0e403c49 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -729,11 +729,6 @@ 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"); @@ -757,6 +752,12 @@ void CTheScripts::Init() UpsideDownCars.Init(); StuckCars.Init(); #ifdef USE_DEBUG_SCRIPT_LOADER + // 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; + int mainf = OpenScript(); #else CFileMgr::SetDir("data");