Amended missing tag "ManiacHook" to Debug::kExecutionType & added som…

…e static_asserts so it don't happen again
florianessl · Feb 11, 2025 · b987a84 · b987a84
1 parent 0d39709
commit b987a84
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/src/filefinder.h b/src/filefinder.h
@@ -50,7 +50,7 @@ namespace FileFinder {
 	 * Type of the project. Used to differentiate between supported games (2kX or EasyRPG)
 	 * and known but unsupported (i.e. newer RPG Makers).
 	 */
-	enum ProjectType {
+	enum class ProjectType {
 		Unknown,
 		// 2kX or EasyRPG
 		Supported,
@@ -62,7 +62,8 @@ namespace FileFinder {
 		WolfRpgEditor,
 		Encrypted2k3Maniacs,
 		RpgMaker95,
-		SimRpgMaker95
+		SimRpgMaker95,
+		LAST
 	};
 
 	constexpr auto kProjectType = lcf::makeEnumTags<ProjectType>(
@@ -77,6 +78,7 @@ namespace FileFinder {
 		"RPG Maker 95",
 		"Sim RPG Maker 95"
 	);
+	static_assert(kProjectType.size() == static_cast<size_t>(ProjectType::LAST));
 
 	/**
 	 * Helper struct combining the project's directory and its type (used by Game Browser)

diff --git a/src/game_interpreter_shared.h b/src/game_interpreter_shared.h
@@ -33,14 +33,16 @@ namespace Game_Interpreter_Shared {
 		None = 0,
 		MapEvent,
 		CommonEvent,
-		BattleEvent
+		BattleEvent,
+		LAST
 	};
 	static constexpr auto kEventType = lcf::makeEnumTags<EventType>(
 		"None",
 		"MapEvent",
 		"CommonEvent",
 		"BattleEvent"
 	);
+	static_assert(kEventType.size() == static_cast<size_t>(EventType::LAST));
 
 	enum class ExecutionType {
 		/*
@@ -64,7 +66,8 @@ namespace Game_Interpreter_Shared {
 		/* Event code was dynamically evaluated. (ManiacCallCommand) */
 		Eval,
 		DebugCall,
-		ManiacHook
+		ManiacHook,
+		LAST
 	};
 	static constexpr auto kExecutionType = lcf::makeEnumTags<ExecutionType>(
 		"Action",
@@ -79,8 +82,10 @@ namespace Game_Interpreter_Shared {
 		"---",
 		"DeathHandler",
 		"Eval",
-		"DebugCall"
+		"DebugCall",
+		"ManiacHook"
 	);
+	static_assert(kExecutionType.size() == static_cast<size_t>(ExecutionType::LAST));
 
 	/*
 	* Indicates how the target of an interpreter operation (lvalue) should be evaluated.

diff --git a/src/input_buttons.h b/src/input_buttons.h
@@ -130,8 +130,8 @@ namespace Input {
 		"FAST_FORWARD_A",
 		"FAST_FORWARD_B",
 		"TOGGLE_FULLSCREEN",
-		"TOGGLE_ZOOM",
-		"BUTTON_COUNT");
+		"TOGGLE_ZOOM");
+	static_assert(kInputButtonNames.size() == static_cast<size_t>(BUTTON_COUNT));
 
 	constexpr auto kInputButtonHelp = lcf::makeEnumTags<InputButton>(
 		"Up Direction",
@@ -175,8 +175,8 @@ namespace Input {
 		"Run the game at x{} speed",
 		"Run the game at x{} speed",
 		"Toggle Fullscreen mode",
-		"Toggle Window Zoom level",
-		"Total Button Count");
+		"Toggle Window Zoom level");
+	static_assert(kInputButtonHelp.size() == static_cast<size_t>(BUTTON_COUNT));
 
 	/**
 	 * Return true if the given button is a system button.
@@ -241,8 +241,8 @@ namespace Input {
 			"RIGHT",
 			"UPLEFT",
 			"UP",
-			"UPRIGHT",
-			"NUM_DIRECTIONS");
+			"UPRIGHT");
+		static_assert(kInputDirectionNames.size() == static_cast<size_t>(NUM_DIRECTIONS));
 	};
 
 	using ButtonMappingArray = FlatUniqueMultiMap<InputButton,Keys::InputKey>;

diff --git a/src/rtp.h b/src/rtp.h
@@ -50,7 +50,8 @@ namespace RTP {
 		RPG2003_VladRussian,
 		RPG2003_RpgUniverseSpanishPortuguese,
 		RPG2003_Korean,
-		RPG2003_OfficialTraditionalChinese
+		RPG2003_OfficialTraditionalChinese,
+		LAST
 	};
 
 	constexpr auto kTypes = lcf::makeEnumTags<Type>(
@@ -66,6 +67,7 @@ namespace RTP {
 		"Korean Translation",
 		"Official Traditional Chinese"
 	);
+	static_assert(kTypes.size() == static_cast<size_t>(Type::LAST));
 
 	struct RtpHitInfo {
 		RTP::Type type;

diff --git a/src/window_gamelist.cpp b/src/window_gamelist.cpp
@@ -118,7 +118,7 @@ void Window_GameList::DrawItem(int index) {
 
 #ifndef USE_CUSTOM_FILEBUF
 	auto color = Font::ColorDefault;
-	if (ge.type == FileFinder::Unknown) {
+	if (ge.type == FileFinder::ProjectType::Unknown) {
 		color = Font::ColorHeal;
 	} else if (ge.type > FileFinder::ProjectType::Supported) {
 		color = Font::ColorKnockout;