From 8562545138ff3bbf66b2aa92b4a96e8318db96f4 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Mon, 30 Dec 2024 14:46:47 +0100
Subject: [PATCH] Move MapGen and MapHelpers units into map_generator folder

---
 src/openrct2-ui/windows/MapGen.cpp            |  2 +-
 src/openrct2/libopenrct2.vcxproj              |  8 ++--
 .../world/{ => map_generator}/MapGen.cpp      | 44 +++++++++----------
 .../world/{ => map_generator}/MapGen.h        |  4 +-
 .../world/{ => map_generator}/MapHelpers.cpp  |  6 +--
 .../world/{ => map_generator}/MapHelpers.h    |  2 +-
 6 files changed, 33 insertions(+), 33 deletions(-)
 rename src/openrct2/world/{ => map_generator}/MapGen.cpp (97%)
 rename src/openrct2/world/{ => map_generator}/MapGen.h (95%)
 rename src/openrct2/world/{ => map_generator}/MapHelpers.cpp (99%)
 rename src/openrct2/world/{ => map_generator}/MapHelpers.h (96%)

diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp
index 353fcfbff6..52b1272d9d 100644
--- a/src/openrct2-ui/windows/MapGen.cpp
+++ b/src/openrct2-ui/windows/MapGen.cpp
@@ -25,7 +25,7 @@
 #include <openrct2/sprites.h>
 #include <openrct2/windows/Intent.h>
 #include <openrct2/world/Map.h>
-#include <openrct2/world/MapGen.h>
+#include <openrct2/world/map_generator/MapGen.h>
 
 namespace OpenRCT2::Ui::Windows
 {
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index 44f08b3617..a7ad8410df 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -616,8 +616,6 @@
     <ClInclude Include="world\Location.hpp" />
     <ClInclude Include="world\Map.h" />
     <ClInclude Include="world\MapAnimation.h" />
-    <ClInclude Include="world\MapGen.h" />
-    <ClInclude Include="world\MapHelpers.h" />
     <ClInclude Include="world\Park.h" />
     <ClInclude Include="world\QuarterTile.h" />
     <ClInclude Include="world\Scenery.h" />
@@ -626,6 +624,8 @@
     <ClInclude Include="world\TileElementsView.h" />
     <ClInclude Include="world\TileInspector.h" />
     <ClInclude Include="world\TilePointerIndex.hpp" />
+    <ClInclude Include="world\map_generator\MapGen.h" />
+    <ClInclude Include="world\map_generator\MapHelpers.h" />
     <ClInclude Include="world\tile_element\BannerElement.h" />
     <ClInclude Include="world\tile_element\EntranceElement.h" />
     <ClInclude Include="world\tile_element\LargeSceneryElement.h" />
@@ -1115,13 +1115,13 @@
     <ClCompile Include="world\Footpath.cpp" />
     <ClCompile Include="world\Map.cpp" />
     <ClCompile Include="world\MapAnimation.cpp" />
-    <ClCompile Include="world\MapGen.cpp" />
-    <ClCompile Include="world\MapHelpers.cpp" />
     <ClCompile Include="world\Park.cpp" />
     <ClCompile Include="world\QuarterTile.cpp" />
     <ClCompile Include="world\Scenery.cpp" />
     <ClCompile Include="world\SurfaceData.cpp" />
     <ClCompile Include="world\TileInspector.cpp" />
+    <ClCompile Include="world\map_generator\MapGen.cpp" />
+    <ClCompile Include="world\map_generator\MapHelpers.cpp" />
     <ClCompile Include="world\tile_element\BannerElement.cpp" />
     <ClCompile Include="world\tile_element\EntranceElement.cpp" />
     <ClCompile Include="world\tile_element\LargeSceneryElement.cpp" />
diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/map_generator/MapGen.cpp
similarity index 97%
rename from src/openrct2/world/MapGen.cpp
rename to src/openrct2/world/map_generator/MapGen.cpp
index 1c35ea05ba..2f1eaa7c80 100644
--- a/src/openrct2/world/MapGen.cpp
+++ b/src/openrct2/world/map_generator/MapGen.cpp
@@ -9,29 +9,29 @@
 
 #include "MapGen.h"
 
-#include "../Context.h"
-#include "../Diagnostic.h"
-#include "../Game.h"
-#include "../GameState.h"
-#include "../core/Guard.hpp"
-#include "../core/Imaging.h"
-#include "../core/String.hpp"
-#include "../localisation/StringIds.h"
-#include "../object/ObjectEntryManager.h"
-#include "../object/ObjectList.h"
-#include "../object/ObjectManager.h"
-#include "../object/SmallSceneryEntry.h"
-#include "../object/TerrainEdgeObject.h"
-#include "../object/TerrainSurfaceObject.h"
-#include "../platform/Platform.h"
-#include "../util/Util.h"
-#include "../world/tile_element/Slope.h"
-#include "../world/tile_element/SmallSceneryElement.h"
-#include "../world/tile_element/SurfaceElement.h"
-#include "../world/tile_element/TileElement.h"
-#include "Map.h"
+#include "../../Context.h"
+#include "../../Diagnostic.h"
+#include "../../Game.h"
+#include "../../GameState.h"
+#include "../../core/Guard.hpp"
+#include "../../core/Imaging.h"
+#include "../../core/String.hpp"
+#include "../../localisation/StringIds.h"
+#include "../../object/ObjectEntryManager.h"
+#include "../../object/ObjectList.h"
+#include "../../object/ObjectManager.h"
+#include "../../object/SmallSceneryEntry.h"
+#include "../../object/TerrainEdgeObject.h"
+#include "../../object/TerrainSurfaceObject.h"
+#include "../../platform/Platform.h"
+#include "../../util/Util.h"
+#include "../../world/tile_element/Slope.h"
+#include "../../world/tile_element/SmallSceneryElement.h"
+#include "../../world/tile_element/SurfaceElement.h"
+#include "../../world/tile_element/TileElement.h"
+#include "../Map.h"
+#include "../Scenery.h"
 #include "MapHelpers.h"
-#include "Scenery.h"
 
 #include <cmath>
 #include <cstring>
diff --git a/src/openrct2/world/MapGen.h b/src/openrct2/world/map_generator/MapGen.h
similarity index 95%
rename from src/openrct2/world/MapGen.h
rename to src/openrct2/world/map_generator/MapGen.h
index 2df619823a..aa3af57937 100644
--- a/src/openrct2/world/MapGen.h
+++ b/src/openrct2/world/map_generator/MapGen.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "../core/StringTypes.h"
-#include "Location.hpp"
+#include "../../core/StringTypes.h"
+#include "../Location.hpp"
 
 enum class MapGenAlgorithm : uint8_t
 {
diff --git a/src/openrct2/world/MapHelpers.cpp b/src/openrct2/world/map_generator/MapHelpers.cpp
similarity index 99%
rename from src/openrct2/world/MapHelpers.cpp
rename to src/openrct2/world/map_generator/MapHelpers.cpp
index 42a2e43871..94efbe03b2 100644
--- a/src/openrct2/world/MapHelpers.cpp
+++ b/src/openrct2/world/map_generator/MapHelpers.cpp
@@ -9,9 +9,9 @@
 
 #include "MapHelpers.h"
 
-#include "../world/tile_element/Slope.h"
-#include "../world/tile_element/SurfaceElement.h"
-#include "Map.h"
+#include "../../world/tile_element/Slope.h"
+#include "../../world/tile_element/SurfaceElement.h"
+#include "../Map.h"
 
 #include <algorithm>
 
diff --git a/src/openrct2/world/MapHelpers.h b/src/openrct2/world/map_generator/MapHelpers.h
similarity index 96%
rename from src/openrct2/world/MapHelpers.h
rename to src/openrct2/world/map_generator/MapHelpers.h
index bd9fa0ea12..8b2e50a3e9 100644
--- a/src/openrct2/world/MapHelpers.h
+++ b/src/openrct2/world/map_generator/MapHelpers.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "Location.hpp"
+#include "../Location.hpp"
 
 enum
 {