From fcfb0003172b6eab110dec190d4f2d63c367184b Mon Sep 17 00:00:00 2001 From: Nayla Hanegan Date: Thu, 20 Apr 2023 20:23:46 -0400 Subject: [PATCH] work on netcore --- Source/Core/Core/MarioPartyNetplay/Discord.cpp | 4 +++- Source/Core/DolphinQt/MainWindow.cpp | 6 +++--- Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp | 4 ++-- Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp | 4 ++-- Source/Core/UICommon/NetPlayIndex.cpp | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/MarioPartyNetplay/Discord.cpp b/Source/Core/Core/MarioPartyNetplay/Discord.cpp index 82624f7441..5aed6fe421 100644 --- a/Source/Core/Core/MarioPartyNetplay/Discord.cpp +++ b/Source/Core/Core/MarioPartyNetplay/Discord.cpp @@ -21,7 +21,9 @@ bool mpn_update_discord() if (CurrentState.Boards && CurrentState.Board) { - snprintf(Details, sizeof(Details), "Players: 1/4 Turn: %d/%d", + DiscordRichPresence discord_presence = {}; + snprintf(Details, sizeof(Details), "Players: %/4 Turn: %d/%d", + (discord_presence.partySize, mpn_read_value(CurrentState.Addresses->CurrentTurn, 1), mpn_read_value(CurrentState.Addresses->TotalTurns, 1)); diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 480e1dee16..e51e7d3c17 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("Quitter!"), + confirm_parent, tr("Someone Quit!"), m_stop_requested ? tr("A user closed down their game from the netplay lobby. " - "This could the Netplay session has ended due to someone ragequitting! " + "This means the Netplay session has ended! " "Do you want to stop the current emulation?") : tr("A user closed down their game from the netplay lobby. " - "This could the Netplay session has ended due to someone ragequitting" + "This means the Netplay session has ended" "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 2a29141262..e2b3fe0021 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"] = Common::GetScmDescStr(); + filters["version"] = "MPN"; 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() == entry.version; + const bool enabled = Common::GetScmDescStr() == "MPN"; 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 6d207444e3..2559725d03 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"] = Common::GetScmDescStr(); + filters["version"] = "MPN"; 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() == entry.version; + const bool enabled = Common::GetScmDescStr() == "MPN"; 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 aaaa4549a8..5c15d03581 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=" + Common::GetScmDescStr(), + std::to_string(session.player_count) + "&version=MPN", {{"X-Is-Dolphin", "1"}}, Common::HttpRequest::AllowedReturnCodes::All); if (!response.has_value())