Merge pull request #551 from OutpostUniverse/DisabledReasonScopedEnum

Disabled reason scoped enum
OutpostUniverse · Jul 27, 2020 · 913a2dd · 913a2dd
2 parents 56c518c + 37dfba7
commit 913a2dd
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/OPHD/Common.cpp b/OPHD/Common.cpp
@@ -88,14 +88,14 @@ std::map<MineProductionRate, std::string> MINE_YIELD_TRANSLATION =
 
 std::map<DisabledReason, std::string> DISABLED_REASON_TABLE =
 {
-	{ DisabledReason::DISABLED_NONE, constants::STRUCTURE_DISABLED_NONE },
-
-	{ DisabledReason::DISABLED_CHAP, constants::STRUCTURE_DISABLED_CHAP },
-	{ DisabledReason::DISABLED_DISCONNECTED, constants::STRUCTURE_DISABLED_DISCONNECTED },
-	{ DisabledReason::DISABLED_ENERGY, constants::STRUCTURE_DISABLED_ENERGY },
-	{ DisabledReason::DISABLED_POPULATION, constants::STRUCTURE_DISABLED_POPULATION },
-	{ DisabledReason::DISABLED_REFINED_RESOURCES, constants::STRUCTURE_DISABLED_REFINED_RESOURCES },
-	{ DisabledReason::DISABLED_STRUCTURAL_INTEGRITY, constants::STRUCTURE_DISABLED_STRUCTURAL_INTEGRITY }
+	{ DisabledReason::None, constants::STRUCTURE_DISABLED_NONE },
+
+	{ DisabledReason::Chap, constants::STRUCTURE_DISABLED_CHAP },
+	{ DisabledReason::Disconnected, constants::STRUCTURE_DISABLED_DISCONNECTED },
+	{ DisabledReason::Energy, constants::STRUCTURE_DISABLED_ENERGY },
+	{ DisabledReason::Population, constants::STRUCTURE_DISABLED_POPULATION },
+	{ DisabledReason::RefinedResources, constants::STRUCTURE_DISABLED_REFINED_RESOURCES },
+	{ DisabledReason::StructuralIntegrity, constants::STRUCTURE_DISABLED_STRUCTURAL_INTEGRITY }
 };
 
 

diff --git a/OPHD/Common.h b/OPHD/Common.h
@@ -64,16 +64,16 @@ enum class MineProductionRate
 /**
  * 
  */
-enum DisabledReason
+enum class DisabledReason
 {
-	DISABLED_NONE, /**< Not Disabled, default reason. */
-
-	DISABLED_CHAP, /**< Requires atmosphere, no atmosphere available. */
-	DISABLED_DISCONNECTED, /**< Not connected to Command Center */
-	DISABLED_ENERGY, /**< Not enough Energy to operate. */
-	DISABLED_POPULATION, /**< Insufficient workers or scientists (or both) */
-	DISABLED_REFINED_RESOURCES, /**< Insufficient mined and refined resources */
-	DISABLED_STRUCTURAL_INTEGRITY /**< Structural integrity out of operating tolerances (damaged structure) */
+	None, /**< Not Disabled, default reason. */
+
+	Chap, /**< Requires atmosphere, no atmosphere available. */
+	Disconnected, /**< Not connected to Command Center */
+	Energy, /**< Not enough Energy to operate. */
+	Population, /**< Insufficient workers or scientists (or both) */
+	RefinedResources, /**< Insufficient mined and refined resources */
+	StructuralIntegrity /**< Structural integrity out of operating tolerances (damaged structure) */
 };
 
 

diff --git a/OPHD/StructureManager.cpp b/OPHD/StructureManager.cpp
@@ -145,14 +145,14 @@ void StructureManager::updateStructures(ResourcePool& resourcePool, PopulationPo
 		// Connection Check
 		if (!structureConnected(structure) && !structure->selfSustained())
 		{
-			structure->disable(DisabledReason::DISABLED_DISCONNECTED);
+			structure->disable(DisabledReason::Disconnected);
 			continue;
 		}
 
 		// CHAP Check
 		if (structure->requiresCHAP() && !chapAvailable)
 		{
-			structure->disable(DisabledReason::DISABLED_CHAP);
+			structure->disable(DisabledReason::Chap);
 			continue;
 		}
 
@@ -166,7 +166,7 @@ void StructureManager::updateStructures(ResourcePool& resourcePool, PopulationPo
 		if (!popPool.enoughPopulationAvailable(Population::PersonRole::ROLE_WORKER, (*_populationRequired)[0]) ||
 			!popPool.enoughPopulationAvailable(Population::PersonRole::ROLE_SCIENTIST, (*_populationRequired)[1]))
 		{
-			structure->disable(DisabledReason::DISABLED_POPULATION);
+			structure->disable(DisabledReason::Population);
 			continue;
 		}
 		else
@@ -180,8 +180,8 @@ void StructureManager::updateStructures(ResourcePool& resourcePool, PopulationPo
 			if (!structure->isIdle()) //-V571
 			{
 				/// \fixme	Ugly. Special case code specifically to determine if energy is the reason for a disabled structure.
-				if (structure->resourcesIn().energy() > resourcePool.energy()) { structure->disable(DisabledReason::DISABLED_ENERGY); }
-				else { structure->disable(DisabledReason::DISABLED_REFINED_RESOURCES); }
+				if (structure->resourcesIn().energy() > resourcePool.energy()) { structure->disable(DisabledReason::Energy); }
+				else { structure->disable(DisabledReason::RefinedResources); }
 				continue;
 			}
 		}

diff --git a/OPHD/Things/Structures/Structure.cpp b/OPHD/Things/Structures/Structure.cpp
@@ -100,7 +100,7 @@ void Structure::enable()
 	sprite().resume();
 	sprite().color(NAS2D::Color::White);
 	state(StructureState::OPERATIONAL);
-	mDisabledReason = DisabledReason::DISABLED_NONE;
+	mDisabledReason = DisabledReason::None;
 	mIdleReason = IdleReason::IDLE_NONE;
 }
 
@@ -117,7 +117,7 @@ void Structure::idle(IdleReason reason)
 
 	sprite().pause();
 	sprite().color(NAS2D::Color{255, 255, 255, 185});
-	mDisabledReason = DisabledReason::DISABLED_NONE;
+	mDisabledReason = DisabledReason::None;
 	mIdleReason = reason;
 	state(StructureState::IDLE);
 }

diff --git a/OPHD/Things/Structures/Structure.h b/OPHD/Things/Structures/Structure.h
@@ -194,7 +194,7 @@ class Structure: public Thing
 	ResourcePool mProductionPool; /**< Resource pool used for production. */
 	ResourcePool mStoragePool; /**< Resource storage pool. */
 
-	DisabledReason mDisabledReason = DisabledReason::DISABLED_NONE;
+	DisabledReason mDisabledReason = DisabledReason::None;
 	IdleReason mIdleReason = IdleReason::IDLE_NONE;
 
 	bool mRepairable = true; /**< Indicates whether or not the Structure can be repaired. Useful for forcing some Structures to die at the end of their life. */