diff options
| author | Lioncash <mai.iam2048@gmail.com> | 2023-12-14 14:10:51 -0500 |
|---|---|---|
| committer | Lioncash <mai.iam2048@gmail.com> | 2023-12-14 14:23:41 -0500 |
| commit | fa70a8fd01045157da536f2ecb543a83c02ee2db (patch) | |
| tree | c80159bb60cebbbd023b57b19e5e6a49ebc17ff0 /Source | |
| parent | fe014dac06d6060049916c4e7ef7bda8504b3f0b (diff) | |
WC24PatchEngine: Make a few functions internally linked
These are only used within this translation unit, so we can remove the
IniFile dependency from the header.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/WC24PatchEngine.cpp | 28 | ||||
| -rw-r--r-- | Source/Core/Core/WC24PatchEngine.h | 6 |
2 files changed, 16 insertions, 18 deletions
diff --git a/Source/Core/Core/WC24PatchEngine.cpp b/Source/Core/Core/WC24PatchEngine.cpp index 1fd7462b77..a1c5532fa1 100644 --- a/Source/Core/Core/WC24PatchEngine.cpp +++ b/Source/Core/Core/WC24PatchEngine.cpp @@ -4,17 +4,19 @@ // WC24PatchEngine // Allows for replacing URLs used in WC24 requests +#include "Core/WC24PatchEngine.h" + #include <algorithm> #include <array> #include <fmt/format.h> +#include "Common/IniFile.h" #include "Common/StringUtil.h" #include "Core/CheatCodes.h" #include "Core/CommonTitles.h" #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" -#include "Core/WC24PatchEngine.h" namespace WC24PatchEngine { @@ -38,7 +40,7 @@ static constexpr std::array<u64, 15> s_wc24_channels{ static std::vector<NetworkPatch> s_patches; -bool DeserializeLine(const std::string& line, NetworkPatch* patch) +static bool DeserializeLine(const std::string& line, NetworkPatch* patch) { const std::vector<std::string> items = SplitString(line, ':'); @@ -54,13 +56,13 @@ bool DeserializeLine(const std::string& line, NetworkPatch* patch) return patch; } -void LoadPatchSection(const Common::IniFile& ini) +static void LoadPatchSection(const Common::IniFile& ini) { std::vector<std::string> lines; NetworkPatch patch; ini.GetLines("WC24Patch", &lines); - for (std::string& line : lines) + for (const std::string& line : lines) { if (line.empty()) continue; @@ -81,6 +83,15 @@ void LoadPatchSection(const Common::IniFile& ini) ReadEnabledAndDisabled(ini, "WC24Patch", &s_patches); } +static bool IsWC24Channel() +{ + const auto& sconfig = SConfig::GetInstance(); + const auto found = + std::find(s_wc24_channels.begin(), s_wc24_channels.end(), sconfig.GetTitleID()); + + return found != s_wc24_channels.end(); +} + static void LoadPatches() { const auto& sconfig = SConfig::GetInstance(); @@ -98,15 +109,6 @@ static void LoadPatches() LoadPatchSection(ini); } -bool IsWC24Channel() -{ - const auto& sconfig = SConfig::GetInstance(); - const auto found = - std::find(s_wc24_channels.begin(), s_wc24_channels.end(), sconfig.GetTitleID()); - - return found != s_wc24_channels.end(); -} - void Reload() { s_patches.clear(); diff --git a/Source/Core/Core/WC24PatchEngine.h b/Source/Core/Core/WC24PatchEngine.h index abbfcc0d58..5f9c78da4c 100644 --- a/Source/Core/Core/WC24PatchEngine.h +++ b/Source/Core/Core/WC24PatchEngine.h @@ -6,8 +6,6 @@ #include <optional> #include <string> -#include "Common/IniFile.h" - namespace WC24PatchEngine { enum class IsKD : bool; @@ -22,9 +20,7 @@ struct NetworkPatch final }; void Reload(); -bool DeserializeLine(const std::string& line, NetworkPatch* patch); -bool IsWC24Channel(); -void LoadPatchSection(const Common::IniFile& ini); + std::optional<std::string> GetNetworkPatch(const std::string& source, IsKD is_kd); std::optional<std::string> GetNetworkPatchByPayload(std::string_view source); } // namespace WC24PatchEngine |
