summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-08 16:44:38 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-08 16:44:38 +0200
commit729ef37040d69c616689af76b684dad87cf1e10a (patch)
treef9f36531f0b25db18bc8e0fc2cbe393ef76cedce /src/control
parentmerge (diff)
parentMerge branch 'master' into miami (diff)
downloadre3-729ef37040d69c616689af76b684dad87cf1e10a.tar
re3-729ef37040d69c616689af76b684dad87cf1e10a.tar.gz
re3-729ef37040d69c616689af76b684dad87cf1e10a.tar.bz2
re3-729ef37040d69c616689af76b684dad87cf1e10a.tar.lz
re3-729ef37040d69c616689af76b684dad87cf1e10a.tar.xz
re3-729ef37040d69c616689af76b684dad87cf1e10a.tar.zst
re3-729ef37040d69c616689af76b684dad87cf1e10a.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 319ba419..6760f77f 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -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");