Resolved merge conflicts. #17

Open
anomaly wants to merge 26 commits from anomaly/iw6-mod:master into master
3 changed files with 13 additions and 10 deletions
Showing only changes of commit 365def1513 - Show all commits
+2 -2
View File
@@ -25,8 +25,8 @@ namespace // demo class
[[nodiscard]] bool rewind_demo(std::optional<std::uint32_t> msec);
[[nodiscard]] bool start(std::filesystem::path& path, bool repeat);
[[nodiscard]] std::optional<std::reference_wrapper<std::filesystem::path>> restart();
template <typename Func, typename... Args> auto use_predicted_data(Func func, Args&&... args);
template <typename Func, typename... Args> auto handle_fast_forward(Func func, Args&&... args);
template <typename Func, typename... Args> [[nodiscard]] auto use_predicted_data(Func func, Args&&... args);
template <typename Func, typename... Args> [[nodiscard]] auto handle_fast_forward(Func func, Args&&... args);
void parse_demo_wrapper();
void stop();
+4 -1
View File
@@ -83,10 +83,12 @@ namespace // checked client num class
return std::isdigit(c);
});
if (all_digits)
{
auto value = std::numeric_limits<std::size_t>::max();
const auto ec = std::from_chars(pid.data(), pid.data() + pid.size(), value).ec;
if (all_digits && ec == std::errc{})
if (ec == std::errc{})
{
const auto client_num = check_client_num(value);
if (client_num)
@@ -95,6 +97,7 @@ namespace // checked client num class
}
}
}
}
for (const auto& cl : game::mp::svs->clients)
{