From dbd12976c8c227b683cd8de2f677661b520153bc Mon Sep 17 00:00:00 2001 From: MysterD Date: Sat, 15 Apr 2023 20:05:04 -0700 Subject: [PATCH] Change how discord secrets are sent --- src/pc/discord/discord_activity.c | 2 +- src/pc/network/coopnet/coopnet.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pc/discord/discord_activity.c b/src/pc/discord/discord_activity.c index 36a8393e8..63f9bd108 100644 --- a/src/pc/discord/discord_activity.c +++ b/src/pc/discord/discord_activity.c @@ -33,7 +33,7 @@ static void on_activity_join_callback(UNUSED void* data, enum EDiscordResult res static void on_activity_join(UNUSED void* data, const char* secret) { LOG_INFO("> on_activity_join, secret: %s", secret); //djui_connect_menu_open(); - app.lobbies->connect_lobby_with_activity_secret(app.lobbies, (char*)secret, NULL, on_activity_join_callback); + //app.lobbies->connect_lobby_with_activity_secret(app.lobbies, (char*)secret, NULL, on_activity_join_callback); } static void on_activity_join_request_callback(UNUSED void* data, enum EDiscordResult result) { diff --git a/src/pc/network/coopnet/coopnet.c b/src/pc/network/coopnet/coopnet.c index 65f32d43c..f957893d4 100644 --- a/src/pc/network/coopnet/coopnet.c +++ b/src/pc/network/coopnet/coopnet.c @@ -127,7 +127,8 @@ void ns_coopnet_update(void) { LOG_INFO("Create lobby"); char mode[64] = ""; mods_get_main_mod_name(mode, 64); - coopnet_lobby_create(CN_GAME_STR, get_version(), configPlayerName, mode, (uint16_t)configAmountofPlayers, configPassword); + snprintf(gCoopNetPassword, 64, "%s", configPassword); + coopnet_lobby_create(CN_GAME_STR, get_version(), configPlayerName, mode, (uint16_t)configAmountofPlayers, gCoopNetPassword); } } else if (sNetworkType == NT_CLIENT) { LOG_INFO("Join lobby"); @@ -151,7 +152,7 @@ static void ns_coopnet_get_lobby_id(UNUSED char* destination, UNUSED u32 destLen if (sLocalLobbyId == 0) { snprintf(destination, destLength, "%s", ""); } else { - snprintf(destination, destLength, "coopnet-id:%" PRIu64 "", sLocalLobbyId); + snprintf(destination, destLength, "coopnet:%" PRIu64 "", sLocalLobbyId); } } @@ -159,7 +160,7 @@ static void ns_coopnet_get_lobby_secret(UNUSED char* destination, UNUSED u32 des if (sLocalLobbyId == 0) { snprintf(destination, destLength, "%s", ""); } else { - snprintf(destination, destLength, "coopnet-pw:%s", gCoopNetPassword); + snprintf(destination, destLength, "coopnet:%" PRIu64":%s", sLocalLobbyId, gCoopNetPassword); } }