mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-11 10:38:20 +00:00
805f6ac431
/home/deen/isos/ddnet/ddnet-source/src/engine/client/discord.cpp: In function ‘EDiscordResult (* GetDiscordCreate())(DiscordVersion, DiscordCreateParams*, IDiscordCore**)’:
/home/deen/isos/ddnet/ddnet-source/src/engine/client/discord.cpp:25:16: error: invalid conversion from ‘EDiscordResult (__attribute__((stdcall)) *)(DiscordVersion, DiscordCreateParams*, IDiscordCore**)’ {aka ‘EDiscordResult (__attribute__((stdcall)) *)(int, DiscordCreateParams*, IDiscordCore**)’} to ‘FDiscordCreate’ {aka ‘EDiscordResult (*)(int, DiscordCreateParams*, IDiscordCore**)’} [-fpermissive]
25 | return DiscordCreate;
| ^~~~~~~~~~~~~
| |
| EDiscordResult (__attribute__((stdcall)) *)(DiscordVersion, DiscordCreateParams*, IDiscordCore**) {aka EDiscordResult (__attribute__((stdcall)) *)(int, DiscordCreateParams*, IDiscordCore**)}
117 lines
2.8 KiB
C++
117 lines
2.8 KiB
C++
#include <engine/discord.h>
|
|
|
|
// Hack for universal binary builds on macOS: Ignore arm64 until Discord
|
|
// releases a native arm64 SDK for macOS.
|
|
|
|
#if defined(CONF_DISCORD) && !(defined(CONF_ARCH_ARM64) && defined(CONF_PLATFORM_MACOS))
|
|
#include <discord_game_sdk.h>
|
|
|
|
typedef enum EDiscordResult DISCORD_API (*FDiscordCreate)(DiscordVersion, struct DiscordCreateParams *, struct IDiscordCore **);
|
|
|
|
#if defined(CONF_DISCORD_DYNAMIC)
|
|
#include <dlfcn.h>
|
|
FDiscordCreate GetDiscordCreate()
|
|
{
|
|
void *pSdk = dlopen("discord_game_sdk.so", RTLD_NOW);
|
|
if(!pSdk)
|
|
{
|
|
return nullptr;
|
|
}
|
|
return (FDiscordCreate)dlsym(pSdk, "DiscordCreate");
|
|
}
|
|
#else
|
|
FDiscordCreate GetDiscordCreate()
|
|
{
|
|
return DiscordCreate;
|
|
}
|
|
#endif
|
|
|
|
class CDiscord : public IDiscord
|
|
{
|
|
IDiscordCore *m_pCore;
|
|
IDiscordActivityEvents m_ActivityEvents;
|
|
IDiscordActivityManager *m_pActivityManager;
|
|
|
|
public:
|
|
bool Init(FDiscordCreate pfnDiscordCreate)
|
|
{
|
|
m_pCore = 0;
|
|
mem_zero(&m_ActivityEvents, sizeof(m_ActivityEvents));
|
|
m_pActivityManager = 0;
|
|
|
|
DiscordCreateParams Params;
|
|
DiscordCreateParamsSetDefault(&Params);
|
|
|
|
Params.client_id = 752165779117441075; // DDNet
|
|
Params.flags = EDiscordCreateFlags::DiscordCreateFlags_NoRequireDiscord;
|
|
Params.event_data = this;
|
|
Params.activity_events = &m_ActivityEvents;
|
|
int Error = pfnDiscordCreate(DISCORD_VERSION, &Params, &m_pCore);
|
|
if(Error != DiscordResult_Ok)
|
|
{
|
|
dbg_msg("discord", "error initializing discord instance, error=%d", Error);
|
|
return true;
|
|
}
|
|
|
|
m_pActivityManager = m_pCore->get_activity_manager(m_pCore);
|
|
return false;
|
|
}
|
|
void Update() override
|
|
{
|
|
m_pCore->run_callbacks(m_pCore);
|
|
}
|
|
void ClearGameInfo() override
|
|
{
|
|
m_pActivityManager->clear_activity(m_pActivityManager, 0, 0);
|
|
}
|
|
void SetGameInfo(NETADDR ServerAddr, const char *pMapName) override
|
|
{
|
|
DiscordActivity Activity;
|
|
mem_zero(&Activity, sizeof(DiscordActivity));
|
|
str_copy(Activity.assets.large_image, "ddnet_logo", sizeof(Activity.assets.large_image));
|
|
str_copy(Activity.assets.large_text, "DDNet logo", sizeof(Activity.assets.large_text));
|
|
Activity.timestamps.start = time_timestamp();
|
|
str_copy(Activity.details, pMapName, sizeof(Activity.details));
|
|
m_pActivityManager->update_activity(m_pActivityManager, &Activity, 0, 0);
|
|
}
|
|
};
|
|
|
|
IDiscord *CreateDiscordImpl()
|
|
{
|
|
FDiscordCreate pfnDiscordCreate = GetDiscordCreate();
|
|
if(!pfnDiscordCreate)
|
|
{
|
|
return 0;
|
|
}
|
|
CDiscord *pDiscord = new CDiscord();
|
|
if(pDiscord->Init(pfnDiscordCreate))
|
|
{
|
|
delete pDiscord;
|
|
return 0;
|
|
}
|
|
return pDiscord;
|
|
}
|
|
#else
|
|
IDiscord *CreateDiscordImpl()
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
class CDiscordStub : public IDiscord
|
|
{
|
|
void Update() override {}
|
|
void ClearGameInfo() override {}
|
|
void SetGameInfo(NETADDR ServerAddr, const char *pMapName) override {}
|
|
};
|
|
|
|
IDiscord *CreateDiscord()
|
|
{
|
|
IDiscord *pDiscord = CreateDiscordImpl();
|
|
if(pDiscord)
|
|
{
|
|
return pDiscord;
|
|
}
|
|
return new CDiscordStub();
|
|
}
|