Merge pull request #1560 from OutpostUniverse/enumAnnoucementType

Use `enum class` for `AnnoucementType`
OutpostUniverse · Feb 3, 2025 · 2655082 · 2655082
2 parents b751b16 + 2c4182c
commit 2655082
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/appOPHD/States/MapViewStateTurn.cpp b/appOPHD/States/MapViewStateTurn.cpp
@@ -430,13 +430,13 @@ void MapViewState::checkColonyShip()
 			populateStructureMenu();
 
 			mWindowStack.bringToFront(&mAnnouncement);
-			mAnnouncement.announcement(MajorEventAnnouncement::AnnouncementType::ANNOUNCEMENT_COLONY_SHIP_CRASH_WITH_COLONISTS);
+			mAnnouncement.announcement(MajorEventAnnouncement::AnnouncementType::ColonyShipCrashWithColonists);
 			mAnnouncement.show();
 		}
 		else
 		{
 			mWindowStack.bringToFront(&mAnnouncement);
-			mAnnouncement.announcement(MajorEventAnnouncement::AnnouncementType::ANNOUNCEMENT_COLONY_SHIP_CRASH);
+			mAnnouncement.announcement(MajorEventAnnouncement::AnnouncementType::ColonyShipCrash);
 			mAnnouncement.show();
 		}
 	}

diff --git a/appOPHD/UI/MajorEventAnnouncement.cpp b/appOPHD/UI/MajorEventAnnouncement.cpp
@@ -33,10 +33,10 @@ void MajorEventAnnouncement::announcement(AnnouncementType a)
 {
 	switch (a)
 	{
-	case AnnouncementType::ANNOUNCEMENT_COLONY_SHIP_CRASH:
+	case AnnouncementType::ColonyShipCrash:
 		mMessage = "Colony ship deorbited and crashed on the surface.";
 		break;
-	case AnnouncementType::ANNOUNCEMENT_COLONY_SHIP_CRASH_WITH_COLONISTS:
+	case AnnouncementType::ColonyShipCrashWithColonists:
 		mMessage = "Colony ship deorbited and crashed on the surface but you left colonists on board!";
 		break;
 	}

diff --git a/appOPHD/UI/MajorEventAnnouncement.h b/appOPHD/UI/MajorEventAnnouncement.h
@@ -8,10 +8,10 @@ class MajorEventAnnouncement : public Window
 {
 public:
 
-	enum AnnouncementType
+	enum class AnnouncementType
 	{
-		ANNOUNCEMENT_COLONY_SHIP_CRASH,
-		ANNOUNCEMENT_COLONY_SHIP_CRASH_WITH_COLONISTS
+		ColonyShipCrash,
+		ColonyShipCrashWithColonists,
 	};
 
 	MajorEventAnnouncement();