mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 15:38:59 +00:00
Code Issues Projects Releases Wiki Activity

Revert "small fix"

Browse source 
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() 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("\\"); CFileMgr::ChangeDir("\\");
switch (ScriptToLoad) { switch (ScriptToLoad) {
case 0: return CFileMgr::OpenFile("data\\main.scm", "rb"); case 0: return CFileMgr::OpenFile("data\\main.scm", "rb");
@ -757,6 +752,12 @@ void CTheScripts::Init()
UpsideDownCars.Init(); UpsideDownCars.Init();
StuckCars.Init(); StuckCars.Init();
#ifdef USE_DEBUG_SCRIPT_LOADER #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(); int mainf = OpenScript();
#else #else
CFileMgr::SetDir("data"); CFileMgr::SetDir("data");