From 3a5dd5a616e2924908fe991da014d46f695862c2 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Mon, 18 May 2020 10:12:11 -0700
Subject: [PATCH] Clean up all scriptclass externs into one location

I have the feeling that none of the devs understood what extern did, and
they kind of just sprinkled it everywhere until things started working.
But like all other classes, it should just be one line in the class's
respective header file, and shouldn't be so messy.
---
 desktop_version/src/Input.cpp   | 2 --
 desktop_version/src/Logic.cpp   | 2 --
 desktop_version/src/Render.cpp  | 2 --
 desktop_version/src/Script.h    | 2 ++
 desktop_version/src/Scripts.cpp | 2 --
 desktop_version/src/editor.cpp  | 2 --
 desktop_version/src/editor.h    | 1 -
 7 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index b3005c6d..536770f3 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -7,8 +7,6 @@
 
 #include "FileSystemUtils.h"
 
-extern scriptclass script;
-
 void updatebuttonmappings(int bind)
 {
     for (
diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index 58012f27..15de6b73 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -2,8 +2,6 @@
 #include "Script.h"
 #include "Network.h"
 
-extern scriptclass script;
-
 void titlelogic()
 {
     //Misc
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index 8ee8ce61..612fdc37 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -10,8 +10,6 @@
 
 #include "MakeAndPlay.h"
 
-extern scriptclass script;
-
 int tr;
 int tg;
 int tb;
diff --git a/desktop_version/src/Script.h b/desktop_version/src/Script.h
index 2187f958..92f8c09c 100644
--- a/desktop_version/src/Script.h
+++ b/desktop_version/src/Script.h
@@ -64,4 +64,6 @@ public:
      std::vector <std::string>  customscript;
 };
 
+extern scriptclass script;
+
 #endif /* SCRIPT_H */
diff --git a/desktop_version/src/Scripts.cpp b/desktop_version/src/Scripts.cpp
index 6b6f3041..711df75c 100644
--- a/desktop_version/src/Scripts.cpp
+++ b/desktop_version/src/Scripts.cpp
@@ -5,8 +5,6 @@
 
 #include <algorithm>
 
-extern scriptclass script;
-
 void scriptclass::load(std::string t)
 {
     //loads script name t into the array
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index 6c415cf1..a1572e0b 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -2072,8 +2072,6 @@ void fillboxabs( int x, int y, int x2, int y2, int c )
 
 extern editorclass ed;
 
-extern scriptclass script;
-
 void editorclass::generatecustomminimap()
 {
     map.customwidth=mapwidth;
diff --git a/desktop_version/src/editor.h b/desktop_version/src/editor.h
index 75282a4e..e47d5b80 100644
--- a/desktop_version/src/editor.h
+++ b/desktop_version/src/editor.h
@@ -46,7 +46,6 @@ struct LevelMetaData
 
 
 extern std::vector<edentities> edentity;
-extern scriptclass script;
 
 class EditorData
 {