From 529cec565380b3c6689641ea427a1bf973014e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Fri, 29 May 2020 22:05:33 +0300
Subject: R to freeroam, idle anims, weapon and cam enum fix

---
 src/control/Script.cpp | 11 ++++++-----
 src/control/Script.h   |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/control')

diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index b9ce5073..d696c090 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"
@@ -599,13 +598,15 @@ void CRunningScript::Init()
 }
 
 #ifdef USE_DEBUG_SCRIPT_LOADER
+int scriptToLoad = 0;
+const char *scriptfile = "main.scm";
 
-const char* scriptfile = "main.scm";
-
+#ifdef _WIN32
+#include <Windows.h>
+#endif
 int open_script()
 {
-	static int scriptToLoad = 1;
-
+	// 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 57b997b1..68d1dc7b 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -520,3 +520,7 @@ private:
 	
 	static bool ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami);
 };
+
+#ifdef USE_DEBUG_SCRIPT_LOADER
+extern int scriptToLoad;
+#endif
\ No newline at end of file
-- 
cgit v1.2.3