diff --git a/Source/Core/Core/MarioPartyNetplay/Discord.cpp b/Source/Core/Core/MarioPartyNetplay/Discord.cpp index b5570ad9c4..8545f1833d 100644 --- a/Source/Core/Core/MarioPartyNetplay/Discord.cpp +++ b/Source/Core/Core/MarioPartyNetplay/Discord.cpp @@ -1,4 +1,4 @@ -#include "Discord.h" +gi#include "Discord.h" #include "UICommon/DiscordPresence.h" #include "Core/Config/NetplaySettings.h" diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index e51e7d3c17..480e1dee16 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -1003,12 +1003,12 @@ bool MainWindow::RequestStopNetplay() // message box returning, which could break cursor locking depending on the order m_render_widget->SetWaitingForMessageBox(true); auto confirm = ModalMessageBox::question( - confirm_parent, tr("Someone Quit!"), + confirm_parent, tr("Quitter!"), m_stop_requested ? tr("A user closed down their game from the netplay lobby. " - "This means the Netplay session has ended! " + "This could the Netplay session has ended due to someone ragequitting! " "Do you want to stop the current emulation?") : tr("A user closed down their game from the netplay lobby. " - "This means the Netplay session has ended" + "This could the Netplay session has ended due to someone ragequitting" "Do you want to stop the current emulation?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::NoButton, Qt::ApplicationModal); diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp index e2b3fe0021..2a29141262 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp @@ -105,7 +105,7 @@ void NetPlayBrowser::Refresh() std::map filters; if (m_check_hide_incompatible->isChecked()) - filters["version"] = "MPN"; + filters["version"] = Common::GetScmDescStr(); if (!m_edit_name->text().isEmpty()) filters["name"] = m_edit_name->text().toStdString(); @@ -190,7 +190,7 @@ void NetPlayBrowser::UpdateList() auto* game_id = new QTableWidgetItem(QString::fromStdString(entry.game_id)); auto* player_count = new QTableWidgetItem(QStringLiteral("%1").arg(entry.player_count)); - const bool enabled = Common::GetScmDescStr() == "MPN"; + const bool enabled = Common::GetScmDescStr() == entry.version; for (const auto& item : {name, in_game, game_id, player_count}) item->setFlags(enabled ? Qt::ItemIsEnabled | Qt::ItemIsSelectable : Qt::NoItemFlags); diff --git a/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp index 2559725d03..6d207444e3 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp @@ -446,7 +446,7 @@ void NetPlaySetupDialog::RefreshBrowser() filters["name"] = m_edit_name->text().toStdString(); if (true) - filters["version"] = "MPN"; + filters["version"] = Common::GetScmDescStr(); if (!m_radio_all->isChecked()) filters["password"] = std::to_string(m_radio_private->isChecked()); @@ -528,7 +528,7 @@ void NetPlaySetupDialog::UpdateListBrowser() auto* game_id = new QTableWidgetItem(QString::fromStdString(entry.game_id)); auto* player_count = new QTableWidgetItem(QStringLiteral("%1").arg(entry.player_count)); - const bool enabled = Common::GetScmDescStr() == "MPN"; + const bool enabled = Common::GetScmDescStr() == entry.version; for (const auto& item : {name, game_id, player_count, in_game}) item->setFlags(enabled ? Qt::ItemIsEnabled | Qt::ItemIsSelectable : Qt::NoItemFlags); diff --git a/Source/Core/UICommon/NetPlayIndex.cpp b/Source/Core/UICommon/NetPlayIndex.cpp index 5c15d03581..aaaa4549a8 100644 --- a/Source/Core/UICommon/NetPlayIndex.cpp +++ b/Source/Core/UICommon/NetPlayIndex.cpp @@ -170,7 +170,7 @@ bool NetPlayIndex::Add(const NetPlaySession& session) "&password=" + std::to_string(session.has_password) + "&method=" + session.method + "&server_id=" + session.server_id + "&in_game=" + std::to_string(session.in_game) + "&port=" + std::to_string(session.port) + "&player_count=" + - std::to_string(session.player_count) + "&version=MPN", + std::to_string(session.player_count) + "&version=" + Common::GetScmDescStr(), {{"X-Is-Dolphin", "1"}}, Common::HttpRequest::AllowedReturnCodes::All); if (!response.has_value())