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

thing

Browse source
This commit is contained in:
Nayla Hanegan 2023-04-24 10:44:58 -04:00
commit 59a3ef26ce
No known key found for this signature in database
GPG key ID: BAFE9001DA16CFA2
2 changed files with 13 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,8 @@
#include "Discord.h" #include "Discord.h"
#include "UICommon/DiscordPresence.h" #include "UICommon/DiscordPresence.h"
#include "Core/Config/NetplaySettings.h" #include "Core/Config/NetplaySettings.h"
#include "Core/Core.h"
#include "Core/IOS/DolphinDevice.h"
bool mpn_update_discord() bool mpn_update_discord()
{ {
@ -21,39 +23,20 @@ bool mpn_update_discord()
if (CurrentState.Boards && CurrentState.Board) if (CurrentState.Boards && CurrentState.Board)
{ {
if (RichPresence.partySize > 0) DiscordRichPresence discord_presence = {};
{
snprintf(Details, sizeof(Details), "Players: %d/4 Turn: %d/%d", RichPresence.partySize, snprintf(Details, sizeof(Details), "Players: 1/4 Turn: %d/%d",
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));
RichPresence.smallImageKey = CurrentState.Board->Icon.c_str(); RichPresence.smallImageKey = CurrentState.Board->Icon.c_str();
RichPresence.smallImageText = CurrentState.Board->Name.c_str(); RichPresence.smallImageText = CurrentState.Board->Name.c_str();
}
else
{
snprintf(Details, sizeof(Details), "Players: 1/4 Turn: %d/%d",
mpn_read_value(CurrentState.Addresses->CurrentTurn, 1),
mpn_read_value(CurrentState.Addresses->TotalTurns, 1));
RichPresence.smallImageKey = CurrentState.Board->Icon.c_str();
RichPresence.smallImageText = CurrentState.Board->Name.c_str();
}
} }
else else
{ {
if (RichPresence.partySize > 0) snprintf(Details, sizeof(Details), "Players: 1/4");
{ RichPresence.smallImageKey = "";
snprintf(Details, sizeof(Details), "Players: %d/4", RichPresence.partySize); RichPresence.smallImageText = "";
RichPresence.smallImageKey = "";
RichPresence.smallImageText = "";
}
else
{
snprintf(Details, sizeof(Details), "Players: 1/4");
RichPresence.smallImageKey = "";
RichPresence.smallImageText = "";
}
} }
RichPresence.details = Details; RichPresence.details = Details;
} }

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

@ -409,7 +409,7 @@ void NetPlayDialog::ConnectWidgets()
Settings::Instance().GetNetPlayClient()->RequestStopGame(); Settings::Instance().GetNetPlayClient()->RequestStopGame();
} }
if (state == Core::State::Uninitialized) if (state == Core::State::Uninitialized)
DisplayMessage(tr("Stopped game"), "red"); DisplayMessage(tr("Stopped game, Please wait for everyone to close the game before relaunching!"), "red");
} }
}); });