#5729: Minor refactoring

codereader · Aug 27, 2021 · fad4eef · fad4eef
1 parent 5cef777
commit fad4eef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/radiantcore/map/Map.cpp b/radiantcore/map/Map.cpp
@@ -877,12 +877,12 @@ void Map::saveMapCopyAs(const cmd::ArgumentList& args)
     if (args.size() == 0 || args[0].getString().empty())
     {
         // Use the overload without arguments, it will ask for a file name
-        GlobalMap().saveCopyAs();
+        saveCopyAs();
     }
     else
     {
         // Pass the first argument we got
-        GlobalMap().saveCopyAs(args[0].getString());
+        saveCopyAs(args[0].getString());
     }
 }
 
@@ -901,7 +901,7 @@ void Map::registerCommands()
     GlobalCommandSystem().addCommand("SaveSelectedAsPrefab", Map::saveSelectedAsPrefab);
     GlobalCommandSystem().addCommand("SaveMap", std::bind(&Map::saveMapCmd, this, std::placeholders::_1));
     GlobalCommandSystem().addCommand("SaveMapAs", Map::saveMapAs);
-    GlobalCommandSystem().addCommand("SaveMapCopyAs", Map::saveMapCopyAs, { cmd::ARGTYPE_STRING | cmd::ARGTYPE_OPTIONAL });
+    GlobalCommandSystem().addCommand("SaveMapCopyAs", std::bind(&Map::saveMapCopyAs, this, std::placeholders::_1), { cmd::ARGTYPE_STRING | cmd::ARGTYPE_OPTIONAL });
     GlobalCommandSystem().addCommand("ExportMap", Map::exportMap);
     GlobalCommandSystem().addCommand("SaveSelected", Map::exportSelection);
 	GlobalCommandSystem().addCommand("ReloadSkins", map::algorithm::reloadSkins);

diff --git a/radiantcore/map/Map.h b/radiantcore/map/Map.h
@@ -218,7 +218,7 @@ class Map :
 	/** greebo: Queries a filename from the user and saves a copy
 	 *          of the current map to the specified filename.
 	 */
-	static void saveMapCopyAs(const cmd::ArgumentList& args);
+	void saveMapCopyAs(const cmd::ArgumentList& args);
 
 	/** greebo: Asks the user for the .pfb file and exports the file/selection
 	 */