diff options
author | erorcun <erayorcunus@gmail.com> | 2020-05-28 21:06:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-28 21:06:50 +0200 |
commit | e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f (patch) | |
tree | 3dc76df5c75331a6fa3ba98706a57a2571a2367f /src/control | |
parent | fix (diff) | |
parent | remove inlining attempts + reload frontend options for real (diff) | |
download | re3-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 '')
-rw-r--r-- | src/control/Script.cpp | 9 | ||||
-rw-r--r-- | src/control/Script.h | 4 |
2 files changed, 10 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; diff --git a/src/control/Script.h b/src/control/Script.h index 743fad99..7964ec6c 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -521,3 +521,7 @@ extern bool doingMissionRetry; uint32 AddExtraDeathDelay(); void RetryMission(int, int); #endif + +#ifdef USE_DEBUG_SCRIPT_LOADER +extern int scriptToLoad; +#endif
\ No newline at end of file |