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

work on netcore

Browse source
This commit is contained in:
Nayla Hanegan 2023-04-20 20:23:46 -04:00
commit fcfb000317
No known key found for this signature in database
GPG key ID: BAFE9001DA16CFA2
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/MarioPartyNetplay/Discord.cpp
View file

@ -21,7 +21,9 @@ bool mpn_update_discord()
if (CurrentState.Boards && CurrentState.Board) 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->CurrentTurn, 1),
mpn_read_value(CurrentState.Addresses->TotalTurns, 1)); mpn_read_value(CurrentState.Addresses->TotalTurns, 1));

6
Source/Core/DolphinQt/MainWindow.cpp
View file

@ -1003,12 +1003,12 @@ bool MainWindow::RequestStopNetplay()
// message box returning, which could break cursor locking depending on the order // message box returning, which could break cursor locking depending on the order
m_render_widget->SetWaitingForMessageBox(true); m_render_widget->SetWaitingForMessageBox(true);
auto confirm = ModalMessageBox::question( 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. " 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?") : "Do you want to stop the current emulation?") :
tr("A user closed down their game from the netplay lobby. " 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?"), "Do you want to stop the current emulation?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::NoButton, Qt::ApplicationModal); QMessageBox::Yes | QMessageBox::No, QMessageBox::NoButton, Qt::ApplicationModal);

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

@ -105,7 +105,7 @@ void NetPlayBrowser::Refresh()
std::map<std::string, std::string> filters; std::map<std::string, std::string> filters;
if (m_check_hide_incompatible->isChecked()) if (m_check_hide_incompatible->isChecked())
filters["version"] = Common::GetScmDescStr(); filters["version"] = "MPN";
if (!m_edit_name->text().isEmpty()) if (!m_edit_name->text().isEmpty())
filters["name"] = m_edit_name->text().toStdString(); 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* game_id = new QTableWidgetItem(QString::fromStdString(entry.game_id));
auto* player_count = new QTableWidgetItem(QStringLiteral("%1").arg(entry.player_count)); 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}) for (const auto& item : {name, in_game, game_id, player_count})
item->setFlags(enabled ? Qt::ItemIsEnabled | Qt::ItemIsSelectable : Qt::NoItemFlags); item->setFlags(enabled ? Qt::ItemIsEnabled | Qt::ItemIsSelectable : Qt::NoItemFlags);

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

@ -446,7 +446,7 @@ void NetPlaySetupDialog::RefreshBrowser()
filters["name"] = m_edit_name->text().toStdString(); filters["name"] = m_edit_name->text().toStdString();
if (true) if (true)
filters["version"] = Common::GetScmDescStr(); filters["version"] = "MPN";
if (!m_radio_all->isChecked()) if (!m_radio_all->isChecked())
filters["password"] = std::to_string(m_radio_private->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* game_id = new QTableWidgetItem(QString::fromStdString(entry.game_id));
auto* player_count = new QTableWidgetItem(QStringLiteral("%1").arg(entry.player_count)); 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}) for (const auto& item : {name, game_id, player_count, in_game})
item->setFlags(enabled ? Qt::ItemIsEnabled | Qt::ItemIsSelectable : Qt::NoItemFlags); item->setFlags(enabled ? Qt::ItemIsEnabled | Qt::ItemIsSelectable : Qt::NoItemFlags);

2
Source/Core/UICommon/NetPlayIndex.cpp
View file

@ -170,7 +170,7 @@ bool NetPlayIndex::Add(const NetPlaySession& session)
"&password=" + std::to_string(session.has_password) + "&method=" + session.method + "&password=" + std::to_string(session.has_password) + "&method=" + session.method +
"&server_id=" + session.server_id + "&in_game=" + std::to_string(session.in_game) + "&server_id=" + session.server_id + "&in_game=" + std::to_string(session.in_game) +
"&port=" + std::to_string(session.port) + "&player_count=" + "&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); {{"X-Is-Dolphin", "1"}}, Common::HttpRequest::AllowedReturnCodes::All);
if (!response.has_value()) if (!response.has_value())