mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-13 03:29:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master

Browse source
This commit is contained in:
Nayla Hanegan 2024-10-23 14:29:49 -04:00
commit 4bd7d38a77
1243 changed files with 15939 additions and 15402 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/DolphinQt/NetPlay/GameDigestDialog.cpp
View file

@ -145,8 +145,7 @@ void GameDigestDialog::SetResult(int pid, const std::string& result)
auto client = Settings::Instance().GetNetPlayClient();
if (client && m_results.size() >= client->GetPlayers().size())
{
if (std::adjacent_find(m_results.begin(), m_results.end(), std::not_equal_to<>()) ==
m_results.end())
if (std::ranges::adjacent_find(m_results, std::ranges::not_equal_to{}) == m_results.end())
{
m_check_label->setText(tr("The hashes match!"));
}

4
Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
View file

@ -25,6 +25,8 @@
#include <algorithm>
#include <sstream>
#include <fmt/ranges.h>
#include "Common/CommonPaths.h"
#include "Common/Config/Config.h"
#include "Common/HttpRequest.h"
@ -810,9 +812,11 @@ void NetPlayDialog::DisplayMessage(const QString& msg, const std::string& color,
QColor c(color.empty() ? QStringLiteral("white") : QString::fromStdString(color));
if (g_ActiveConfig.bShowNetPlayMessages && Core::IsRunning(Core::System::GetInstance()))
{
g_netplay_chat_ui->AppendChat(msg.toStdString(),
{static_cast<float>(c.redF()), static_cast<float>(c.greenF()),
static_cast<float>(c.blueF())});
}
}
void NetPlayDialog::AppendChat(const std::string& msg)