From 9205421090fa2686056f8b7b996c3a5553a8101e Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Mon, 18 May 2020 10:14:12 -0700
Subject: [PATCH] Clean up editorclass externs into one location

Again, like the previous commit, it should just be put in the header
file of its respective class instead of being a mess everywhere.
---
 desktop_version/src/Map.cpp    | 4 ----
 desktop_version/src/Map.h      | 4 ----
 desktop_version/src/editor.cpp | 2 --
 desktop_version/src/editor.h   | 2 ++
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index d416a9ea..784dd75c 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -2,10 +2,6 @@
 
 #include "MakeAndPlay.h"
 
-#if !defined(NO_CUSTOM_LEVELS)
-extern editorclass ed;
-#endif
-
 mapclass::mapclass()
 {
 	//Start here!
diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h
index c514ce79..ded2ab6b 100644
--- a/desktop_version/src/Map.h
+++ b/desktop_version/src/Map.h
@@ -13,10 +13,6 @@
 #include "Music.h"
 #include "editor.h"
 
-#if !defined(NO_CUSTOM_LEVELS)
-extern editorclass ed;
-#endif
-
 class mapclass
 {
 public:
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index a1572e0b..ae5b3f90 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -2070,8 +2070,6 @@ void fillboxabs( int x, int y, int x2, int y2, int c )
 }
 
 
-extern editorclass ed;
-
 void editorclass::generatecustomminimap()
 {
     map.customwidth=mapwidth;
diff --git a/desktop_version/src/editor.h b/desktop_version/src/editor.h
index e47d5b80..59abef02 100644
--- a/desktop_version/src/editor.h
+++ b/desktop_version/src/editor.h
@@ -248,6 +248,8 @@ void editorlogic();
 
 void editorinput();
 
+extern editorclass ed;
+
 #endif /* EDITOR_H */
 
 #endif /* NO_CUSTOM_LEVELS */