Merge pull request #1564 from OutpostUniverse/moveEnumsToLibOphd

Move `enum` definitions to `libOPHD`
OutpostUniverse · Feb 3, 2025 · 6a53204 · 6a53204
2 parents 941ffbf + 299c8c1
commit 6a53204
Show file tree

Hide file tree

Showing 45 changed files with 111 additions and 92 deletions.
diff --git a/appOPHD/GraphWalker.cpp b/appOPHD/GraphWalker.cpp
@@ -1,11 +1,12 @@
-#include "EnumDirection.h"
 #include "GraphWalker.h"
-#include "DirectionOffset.h"
 
 #include "Map/MapCoordinate.h"
 #include "Map/TileMap.h"
 #include "MapObjects/Structure.h"
 
+#include <libOPHD/DirectionOffset.h>
+#include <libOPHD/EnumDirection.h>
+
 
 using namespace NAS2D;
 

diff --git a/appOPHD/Map/MapCoordinate.cpp b/appOPHD/Map/MapCoordinate.cpp
@@ -1,7 +1,7 @@
 
 #include "MapCoordinate.h"
 
-#include "../DirectionOffset.h"
+#include <libOPHD/DirectionOffset.h>
 
 
 MapCoordinate MapCoordinate::translate(MapOffset mapOffset) const

diff --git a/appOPHD/Map/MapView.cpp b/appOPHD/Map/MapView.cpp
@@ -1,7 +1,8 @@
 #include "MapView.h"
 
 #include "TileMap.h"
-#include "../DirectionOffset.h"
+
+#include <libOPHD/DirectionOffset.h>
 
 #include <NAS2D/ParserHelper.h>
 #include <NAS2D/Xml/XmlElement.h>

diff --git a/appOPHD/Map/Tile.h b/appOPHD/Map/Tile.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../EnumTerrainType.h"
-
 #include "MapCoordinate.h"
 
+#include <libOPHD/EnumTerrainType.h>
+
 #include <NAS2D/Math/Point.h>
 #include <NAS2D/Math/Vector.h>
 

diff --git a/appOPHD/Map/TileMap.cpp b/appOPHD/Map/TileMap.cpp
@@ -1,9 +1,9 @@
 #include "TileMap.h"
 
-#include "../DirectionOffset.h"
 #include "../MapObjects/Mine.h"
 #include "../MapObjects/Structure.h"
 
+#include <libOPHD/DirectionOffset.h>
 #include <libOPHD/RandomNumberGenerator.h>
 
 #include <NAS2D/Utility.h>

diff --git a/appOPHD/MapObjects/Mine.h b/appOPHD/MapObjects/Mine.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "../EnumMineProductionRate.h"
 #include "../StorableResources.h"
 
+#include <libOPHD/EnumMineProductionRate.h>
+
 #include <NAS2D/Math/Point.h>
 
 #include <bitset>

diff --git a/appOPHD/MapObjects/Robots/Robodigger.cpp b/appOPHD/MapObjects/Robots/Robodigger.cpp
@@ -1,8 +1,9 @@
 #include "Robodigger.h"
 
-#include "../../EnumDirection.h"
 #include "../../Constants/Strings.h"
 
+#include <libOPHD/EnumDirection.h>
+
 
 Robodigger::Robodigger() :
 	Robot(constants::Robodigger, "robots/robodigger.sprite", Robot::Type::Digger),

diff --git a/appOPHD/MapObjects/Robots/Robominer.cpp b/appOPHD/MapObjects/Robots/Robominer.cpp
@@ -2,12 +2,13 @@
 
 #include "../../Constants/Strings.h"
 
-#include "../../DirectionOffset.h"
 #include "../../Map/TileMap.h"
 #include "../../StructureManager.h"
 #include "../Structures/MineFacility.h"
 #include "../Structures/MineShaft.h"
 
+#include <libOPHD/DirectionOffset.h>
+
 #include <NAS2D/Utility.h>
 
 

diff --git a/appOPHD/MapObjects/Structure.h b/appOPHD/MapObjects/Structure.h
@@ -2,13 +2,13 @@
 
 #include "MapObject.h"
 
-#include "../EnumConnectorDir.h"
-#include "../EnumDisabledReason.h"
-#include "../EnumIdleReason.h"
-#include "../EnumStructureID.h"
 #include "../StorableResources.h"
 #include "../UI/StringTable.h"
 
+#include <libOPHD/EnumConnectorDir.h>
+#include <libOPHD/EnumDisabledReason.h>
+#include <libOPHD/EnumIdleReason.h>
+#include <libOPHD/EnumStructureID.h>
 #include <libOPHD/Population/PopulationPool.h>
 
 #include <NAS2D/Dictionary.h>

diff --git a/appOPHD/MapObjects/Structures/Factory.h b/appOPHD/MapObjects/Structures/Factory.h
@@ -2,9 +2,10 @@
 
 #include "../Structure.h"
 
-#include "../../EnumProductType.h"
 #include "../../StorableResources.h"
 
+#include <libOPHD/EnumProductType.h>
+
 
 struct ProductionCost;
 

diff --git a/appOPHD/MineProductionRateString.cpp b/appOPHD/MineProductionRateString.cpp
@@ -1,8 +1,9 @@
 #include "MineProductionRateString.h"
 
-#include "EnumMineProductionRate.h"
 #include "Constants/Strings.h"
 
+#include <libOPHD/EnumMineProductionRate.h>
+
 #include <map>
 
 

diff --git a/appOPHD/ProductCatalogue.h b/appOPHD/ProductCatalogue.h
@@ -1,7 +1,6 @@
 #pragma once
 
-
-#include "EnumProductType.h"
+#include <libOPHD/EnumProductType.h>
 
 #include <map>
 #include <string>

diff --git a/appOPHD/ProductPool.h b/appOPHD/ProductPool.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "EnumProductType.h"
+#include <libOPHD/EnumProductType.h>
 
 #include <NAS2D/Dictionary.h>
 

diff --git a/appOPHD/States/CrimeExecution.cpp b/appOPHD/States/CrimeExecution.cpp
@@ -1,10 +1,10 @@
 #include "CrimeExecution.h"
 
 #include "../Resources.h"
-#include "../EnumDifficulty.h"
 #include "../StructureManager.h"
 #include "../MapObjects/Structures/FoodProduction.h"
 
+#include <libOPHD/EnumDifficulty.h>
 #include <libOPHD/RandomNumberGenerator.h>
 
 #include <NAS2D/StringUtils.h>

diff --git a/appOPHD/States/CrimeRateUpdate.h b/appOPHD/States/CrimeRateUpdate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EnumDifficulty.h"
+#include <libOPHD/EnumDifficulty.h>
 
 #include <vector>
 #include <map>

diff --git a/appOPHD/States/MapViewState.cpp b/appOPHD/States/MapViewState.cpp
@@ -8,7 +8,6 @@
 #include "../Constants/Strings.h"
 #include "../Constants/UiConstants.h"
 
-#include "../DirectionOffset.h"
 #include "../Cache.h"
 #include "../PointerType.h"
 #include "../MeanSolarDistance.h"
@@ -24,6 +23,8 @@
 #include "../UI/DetailMap.h"
 #include "../UI/NavControl.h"
 
+#include <libOPHD/DirectionOffset.h>
+
 #include <NAS2D/Utility.h>
 #include <NAS2D/EventHandler.h>
 #include <NAS2D/Renderer/Renderer.h>

diff --git a/appOPHD/States/MapViewStateEvent.cpp b/appOPHD/States/MapViewStateEvent.cpp
@@ -4,12 +4,13 @@
 // ==================================================================================
 #include "MapViewState.h"
 
-#include "../DirectionOffset.h"
 #include "../StructureCatalogue.h"
 #include "../StructureManager.h"
 #include "../Map/TileMap.h"
 #include "../MapObjects/Robots.h"
 
+#include <libOPHD/DirectionOffset.h>
+
 #include <NAS2D/Utility.h>
 
 #include <stdexcept>

diff --git a/appOPHD/States/MapViewStateHelper.cpp b/appOPHD/States/MapViewStateHelper.cpp
@@ -13,14 +13,15 @@
 #include "../Constants/Strings.h"
 #include "../StructureCatalogue.h"
 #include "../StructureManager.h"
-#include "../EnumDirection.h"
-#include "../DirectionOffset.h"
 #include "../Map/TileMap.h"
 #include "../MapObjects/StructureType.h"
 #include "../MapObjects/Structures/Warehouse.h"
 
 #include "../UI/MessageBox.h"
 
+#include <libOPHD/DirectionOffset.h>
+#include <libOPHD/EnumDirection.h>
+
 #include <NAS2D/Utility.h>
 
 #include <algorithm>

diff --git a/appOPHD/States/MapViewStateHelper.h b/appOPHD/States/MapViewStateHelper.h
@@ -9,12 +9,12 @@
 
 #pragma once
 
-#include "../EnumConnectorDir.h"
-#include "../EnumProductType.h"
-#include "../EnumStructureID.h"
-
 #include "../Map/MapCoordinate.h"
 
+#include <libOPHD/EnumConnectorDir.h>
+#include <libOPHD/EnumProductType.h>
+#include <libOPHD/EnumStructureID.h>
+
 #include <map>
 
 

diff --git a/appOPHD/States/MapViewStateTurn.cpp b/appOPHD/States/MapViewStateTurn.cpp
@@ -10,12 +10,13 @@
 #include "../Map/TileMap.h"
 
 #include "../Cache.h"
-#include "../DirectionOffset.h"
-#include "../EnumMoraleIndex.h"
 #include "../MoraleString.h"
 #include "../StorableResources.h"
 #include "../StructureManager.h"
 
+#include <libOPHD/DirectionOffset.h>
+#include <libOPHD/EnumMoraleIndex.h>
+
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
 

diff --git a/appOPHD/States/MapViewStateUi.cpp b/appOPHD/States/MapViewStateUi.cpp
@@ -12,8 +12,6 @@
 #include "../Constants/Strings.h"
 #include "../Constants/UiConstants.h"
 
-#include "../EnumDirection.h"
-#include "../DirectionOffset.h"
 #include "../PointerType.h"
 #include "../StructureCatalogue.h"
 #include "../StructureManager.h"
@@ -25,6 +23,9 @@
 #include "../UI/NavControl.h"
 #include "../UI/CheatMenu.h"
 
+#include <libOPHD/DirectionOffset.h>
+#include <libOPHD/EnumDirection.h>
+
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
 

diff --git a/appOPHD/States/StructureTracker.cpp b/appOPHD/States/StructureTracker.cpp
@@ -1,9 +1,10 @@
 #include "StructureTracker.h"
 
-#include "../EnumConnectorDir.h"
-#include "../EnumStructureID.h"
 #include "../Constants/Strings.h"
 
+#include <libOPHD/EnumConnectorDir.h>
+#include <libOPHD/EnumStructureID.h>
+
 
 namespace
 {

diff --git a/appOPHD/StructureCatalogue.h b/appOPHD/StructureCatalogue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "EnumStructureID.h"
+#include <libOPHD/EnumStructureID.h>
 
 #include <map>
 

diff --git a/appOPHD/UI/DiggerDirection.h b/appOPHD/UI/DiggerDirection.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include <libOPHD/EnumDirection.h>
+
 #include <libControls/Window.h>
 #include <libControls/Button.h>
-#include "../EnumDirection.h"
 
 
 class Tile;

diff --git a/appOPHD/UI/FactoryProduction.h b/appOPHD/UI/FactoryProduction.h
@@ -3,9 +3,10 @@
 #include "IconGrid.h"
 
 #include "../Constants/UiConstants.h"
-#include "../EnumProductType.h"
 #include "../ProductionCost.h"
 
+#include <libOPHD/EnumProductType.h>
+
 #include <libControls/Window.h>
 #include <libControls/Button.h>
 #include <libControls/CheckBox.h>

diff --git a/appOPHD/UI/NavControl.cpp b/appOPHD/UI/NavControl.cpp
@@ -1,11 +1,12 @@
 #include "NavControl.h"
 
 #include "../Cache.h"
-#include "../DirectionOffset.h"
 #include "../Constants/Strings.h"
 #include "../Constants/UiConstants.h"
 #include "../Map/MapView.h"
 
+#include <libOPHD/DirectionOffset.h>
+
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
 #include <NAS2D/Renderer/Color.h>

diff --git a/appOPHD/UI/PopulationPanel.cpp b/appOPHD/UI/PopulationPanel.cpp
@@ -3,11 +3,11 @@
 #include "TrendLabel.h"
 
 #include "../Cache.h"
-#include "../EnumMoraleIndex.h"
 #include "../MoraleString.h"
 #include "../Constants/Strings.h"
 #include "../Constants/UiConstants.h"
 
+#include <libOPHD/EnumMoraleIndex.h>
 #include <libOPHD/Population/Population.h>
 #include <libOPHD/Population/PopulationPool.h>
 #include <libOPHD/Population/Morale.h>

diff --git a/appOPHD/UI/Reports/FactoryReport.h b/appOPHD/UI/Reports/FactoryReport.h
@@ -2,11 +2,13 @@
 
 #include "ReportInterface.h"
 
+#include "../FactoryListBox.h"
+
+#include <libOPHD/EnumProductType.h>
+
 #include <libControls/Button.h>
 #include <libControls/ComboBox.h>
 #include <libControls/TextArea.h>
-#include "../FactoryListBox.h"
-#include "../../EnumProductType.h"
 
 #include <NAS2D/Math/Rectangle.h>
 

diff --git a/appOPHD/UI/TileInspector.cpp b/appOPHD/UI/TileInspector.cpp
@@ -1,11 +1,12 @@
 #include "TileInspector.h"
 
 #include "TextRender.h"
-#include "../EnumTerrainType.h"
 #include "../MineProductionRateString.h"
 #include "../Constants/Strings.h"
 #include "../MapObjects/Mine.h"
 
+#include <libOPHD/EnumTerrainType.h>
+
 #include <map>
 #include <sstream>