diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 16:42:32 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 16:42:32 +0200 |
| commit | 4673f509f6b6e73af93cbf55d2842f289f1a6765 (patch) | |
| tree | 28e611b5a838907860575561931253bdd7a1c739 | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-4673f509f6b6e73af93cbf55d2842f289f1a6765.tar re3-4673f509f6b6e73af93cbf55d2842f289f1a6765.tar.gz re3-4673f509f6b6e73af93cbf55d2842f289f1a6765.tar.bz2 re3-4673f509f6b6e73af93cbf55d2842f289f1a6765.tar.lz re3-4673f509f6b6e73af93cbf55d2842f289f1a6765.tar.xz re3-4673f509f6b6e73af93cbf55d2842f289f1a6765.tar.zst re3-4673f509f6b6e73af93cbf55d2842f289f1a6765.zip | |
| -rw-r--r-- | src/control/Script.cpp | 11 |
1 files 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"); |