mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Move MapGen and MapHelpers units into map_generator folder

Browse Source
This commit is contained in:
Aaron van Geffen
2024-12-30 14:46:47 +01:00
parent 2bdb3a62e3
commit 8562545138
6 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/MapGen.cpp
View File

@@ -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
{

8
src/openrct2/libopenrct2.vcxproj
View File

@@ -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" />

44
src/openrct2/world/MapGen.cpp → src/openrct2/world/map_generator/MapGen.cpp
View File

@@ -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>

4
src/openrct2/world/MapGen.h → src/openrct2/world/map_generator/MapGen.h
View File

@@ -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
{

6
src/openrct2/world/MapHelpers.cpp → src/openrct2/world/map_generator/MapHelpers.cpp
View File

@@ -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>

2
src/openrct2/world/MapHelpers.h → src/openrct2/world/map_generator/MapHelpers.h
View File

@@ -9,7 +9,7 @@
#pragma once
#include "Location.hpp"
#include "../Location.hpp"
enum
{