ChaosMod/Voting: Fix warning & small cleanups

gta-chaos-mod · Jan 30, 2025 · 0322a5e · 0322a5e
1 parent d2a44e1
commit 0322a5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/ChaosMod/Components/Voting.cpp b/ChaosMod/Components/Voting.cpp
@@ -44,14 +44,16 @@ bool Voting::Init()
 		CloseHandle(mutex);
 	}
 
-	m_SecsBeforeVoting   = g_OptionsManager.GetVotingValue({ "VotingSecsBeforeVoting", "TwitchVotingSecsBeforeVoting" },
-	                                                       OPTION_DEFAULT_TWITCH_SECS_BEFORE_VOTING);
+	m_SecsBeforeVoting = g_OptionsManager.GetVotingValue({ "VotingSecsBeforeVoting", "TwitchVotingSecsBeforeVoting" },
+	                                                     OPTION_DEFAULT_TWITCH_SECS_BEFORE_VOTING);
 
-	m_OverlayMode        = g_OptionsManager.GetVotingValue({ "VotingOverlayMode", "TwitchVotingOverlayMode" },
-	                                                       static_cast<OverlayMode>(OPTION_DEFAULT_TWITCH_OVERLAY_MODE));
+	m_OverlayMode      = g_OptionsManager.GetVotingValue({ "VotingOverlayMode", "TwitchVotingOverlayMode" },
+	                                                     static_cast<OverlayMode>(OPTION_DEFAULT_TWITCH_OVERLAY_MODE));
 
-	m_VotingMode = g_OptionsManager.GetVotingValue({ "VotingChanceSystem", "TwitchVotingChanceSystem" },
-	                                                       OPTION_DEFAULT_TWITCH_PROPORTIONAL_VOTING) ? VotingMode::Percentage : VotingMode::Majority;
+	m_VotingMode       = g_OptionsManager.GetVotingValue({ "VotingChanceSystem", "TwitchVotingChanceSystem" },
+	                                                     OPTION_DEFAULT_TWITCH_PROPORTIONAL_VOTING)
+	                       ? VotingMode::Percentage
+	                       : VotingMode::Majority;
 	m_EnableVotingChanceSystemRetainInitialChance =
 	    g_OptionsManager.GetVotingValue({ "VotingChanceSystemRetainChance", "TwitchVotingChanceSystemRetainChance" },
 	                                    OPTION_DEFAULT_TWITCH_PROPORTIONAL_VOTING_RETAIN_CHANCE);
@@ -291,11 +293,9 @@ void Voting::OnRun()
 			m_VotingModeOverride = newMode;
 
 			if (newMode == VotingMode::None)
-			{
 				newMode = m_VotingMode;
-			}
 
-			SendToPipe(std::string("votingmode"), { newMode.ToString() });
+			SendToPipe("votingmode", { std::string(newMode.ToString()) });
 		}
 	}
 

diff --git a/ChaosMod/Util/VotingMode.h b/ChaosMod/Util/VotingMode.h
@@ -30,7 +30,7 @@ class VotingMode
 		return value != a.value;
 	}
 
-	std::string ToString()
+	std::string_view ToString() const
 	{
 		switch (value)
 		{
@@ -43,6 +43,8 @@ class VotingMode
 		case VotingMode::Antimajority:
 			return "ANTIMAJORITY";
 		}
+
+		return "UNKNOWN";
 	}
 
   private: