summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-05-28 21:06:50 +0200
committerGitHub <noreply@github.com>2020-05-28 21:06:50 +0200
commite65a09ea09ccc60c10e4969f8b98c3dfb7566f0f (patch)
tree3dc76df5c75331a6fa3ba98706a57a2571a2367f /src/control/Script.cpp
parentfix (diff)
parentremove inlining attempts + reload frontend options for real (diff)
downloadre3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.gz
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.bz2
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.lz
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.xz
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.zst
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.zip
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r--src/control/Script.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index c8dfd93a..bc15a695 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -1,4 +1,3 @@
-#define WITHWINDOWS // for our script loading hack
#include "common.h"
#include "Script.h"
@@ -539,10 +538,14 @@ void CRunningScript::Init()
}
#ifdef USE_DEBUG_SCRIPT_LOADER
+int scriptToLoad = 0;
+
+#ifdef _WIN32
+#include <Windows.h>
+#endif
int open_script()
{
- static int scriptToLoad = 0;
-
+ // glfwGetKey doesn't work because of CGame::Initialise is blocking
#ifdef _WIN32
if (GetAsyncKeyState('G') & 0x8000)
scriptToLoad = 0;