summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-28 02:07:26 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-28 10:34:12 +0200
commit329a387fdfab403bfd8fadef025510ee1081e38f (patch)
treece602c20941173f858b768dcd9d37564b513c634 /src/control
parentcrash fix (diff)
downloadre3-329a387fdfab403bfd8fadef025510ee1081e38f.tar
re3-329a387fdfab403bfd8fadef025510ee1081e38f.tar.gz
re3-329a387fdfab403bfd8fadef025510ee1081e38f.tar.bz2
re3-329a387fdfab403bfd8fadef025510ee1081e38f.tar.lz
re3-329a387fdfab403bfd8fadef025510ee1081e38f.tar.xz
re3-329a387fdfab403bfd8fadef025510ee1081e38f.tar.zst
re3-329a387fdfab403bfd8fadef025510ee1081e38f.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 1ea970c4..c52b28c6 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"
@@ -504,10 +503,22 @@ void CRunningScript::Init()
}
#ifdef USE_DEBUG_SCRIPT_LOADER
+#ifdef _WIN32
+#include <Windows.h>
+#endif
int open_script()
{
static int scriptToLoad = 0;
+ // Doesn't work because of CGame::Initialise is blocking
+ /*
+ if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_G) == GLFW_PRESS)
+ scriptToLoad = 0;
+ if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_R) == GLFW_PRESS)
+ scriptToLoad = 1;
+ if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_D) == GLFW_PRESS)
+ scriptToLoad = 2;
+ */
#ifdef _WIN32
if (GetAsyncKeyState('G') & 0x8000)
scriptToLoad = 0;