mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

This commit is contained in:
Nikolay Korolev 2021-08-08 17:44:38 +03:00
parent 7b9d8c5a1f e17504a36a
commit 729ef37040
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/control/Script.cpp
View File

@ -894,11 +894,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");
@ -947,6 +942,11 @@ bool CTheScripts::Init(bool loaddata)
if (ScriptSpace)
Shutdown();
#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");