try to fix linker errors without new globals

src/dialogxml/dialogs/dialog.cpp

@@ -43,6 +43,8 @@ const short cDialog::BG_DARK = 5, cDialog::BG_LIGHT = 16;
 short cDialog::defaultBackground = cDialog::BG_DARK;
 cDialog* cDialog::topWindow = nullptr;
 void (*cDialog::redraw_everything)() = nullptr;
+std::function<sf::RenderWindow&()> cDialog::get_mini_map;
+bool* cDialog::map_visible_p = nullptr;
 
 extern std::map<std::string,sf::Color> colour_map;
 
@@ -627,9 +629,6 @@ void cDialog::handleTab(bool reverse) {
 	}
 }
 
-extern sf::RenderWindow& mini_map();
-extern bool map_visible;
-
 // This method handles one event received by the dialog.
 void cDialog::handle_one_event(const sf::Event& currentEvent, cFramerateLimiter& fps_limiter) {
 	using Key = sf::Keyboard::Key;
@@ -744,15 +743,23 @@ void cDialog::handle_one_event(const sf::Event& currentEvent, cFramerateLimiter&
 			break;
 		case sf::Event::LostFocus:
 			has_focus = false;
-			setWindowFloating(mini_map(), false);
+			if(get_mini_map){
+				setWindowFloating(get_mini_map(), false);
+			}
 			break;
 		case sf::Event::GainedFocus:
 			if(!has_focus){
 				has_focus = true;
-				setWindowFloating(mini_map(), true);
+				if(get_mini_map){
+					setWindowFloating(get_mini_map(), true);
+				}
 				makeFrontWindow(mainPtr());
-				if(map_visible)
+				if(get_mini_map){
-					makeFrontWindow(mini_map());
+					if(*map_visible_p){
+						makeFrontWindow(get_mini_map());
+					}
+				}
+
 				std::vector<sf::RenderWindow*> dialog_stack;
 				cDialog* next = this;
 				while(next != nullptr){

src/dialogxml/dialogs/dialog.hpp

@@ -79,6 +79,8 @@ class cDialog : public iComponent, public iNameGiver {
 	bool doAnimations;
 	bool has_focus = false;
 public:
+	static std::function<sf::RenderWindow&()> get_mini_map;
+	static bool* map_visible_p;
 	static void (*redraw_everything)();
 	/// Performs essential startup initialization. Generally should not be called directly.
 	static void init();

src/game/boe.main.cpp

@@ -236,6 +236,8 @@ int main(int argc, char* argv[]) {
 	try{
 #endif
 		cDialog::redraw_everything = &redraw_everything;
+		cDialog::get_mini_map = &mini_map;
+		cDialog::map_visible_p = &map_visible;
 
 		init_boe(argc, argv);
 		

src/pcedit/pc.main.cpp

@@ -83,8 +83,6 @@ char start_name[256];
 // This is just to make location.hpp compile, and represents nothing:
 location center;
 
-bool map_visible = false;
-
 static void process_args(int argc, char* argv[]) {
 	preprocess_args(argc, argv);
 	clara::Args args(argc, argv);

src/scenedit/scen.main.cpp

@@ -101,8 +101,6 @@ fs::path game_dir;
 fs::path game_binary;
 extern std::string last_load_file;
 
-bool map_visible = false;
-
 enum class eLaunchType {LOC,START,ENTRANCE};
 
 static void launch_scenario(eLaunchType type) {