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

This commit is contained in:
Nayla Hanegan 2024-03-03 19:37:55 -05:00
commit f873d6ff71
No known key found for this signature in database
GPG key ID: 3075216CED0DB01D
239 changed files with 18152 additions and 20748 deletions

View file

@ -24,6 +24,8 @@
#include "Common/HttpRequest.h"
#include "Common/StringUtil.h"
#include "Core/System.h"
#endif
namespace Discord
@ -98,7 +100,7 @@ void HandleDiscordJoin(const char* join_secret)
std::string ArtworkForGameId()
{
const DiscIO::Region region = SConfig::GetInstance().m_region;
const bool is_wii = SConfig::GetInstance().bWii;
const bool is_wii = Core::System::GetInstance().IsWii();
const std::string region_code = SConfig::GetInstance().GetGameTDBImageRegionCode(is_wii, region);
static constexpr char cover_url[] = "https://discord.dolphin-emu.org/cover-art/{}/{}.png";