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

Revert "small fix" 

This reverts commit bd96584433.
This commit is contained in:
Nikolay Korolev 2021-08-08 17:42:32 +03:00
parent 8d9508bda4
commit 4673f509f6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/control/Script.cpp
View File

@ -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");