libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 10:10:57 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

Get rid of (unused) global variables that were shadowing local variables

Browse Source
This commit is contained in:
twinaphex 2019-07-14 13:06:47 +02:00
parent e8e4a141de
commit 8ef251acbf
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
discord/discord.c
View File

@ -65,8 +65,6 @@ static bool discord_ready = false;
static bool discord_avatar_ready = false;
static unsigned discord_status = 0;
struct netplay_room *room;
/* The discord API specifies these variables:
- userId --------- char[24] - the userId of the player asking to join
- username ------- char[344] - the username of the player asking to join
@ -76,7 +74,6 @@ struct netplay_room *room;
- partyId - char[128] - the party you would be joining
*/
static char user_id[24];
static char user_name[344];
static char self_party_id[128];
static char peer_party_id[128];
@ -206,8 +203,10 @@ static void handle_discord_join_cb(retro_task_t *task,
netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
snprintf(join_hostname, sizeof(join_hostname), "%s|%d",
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address,
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port);
room->host_method == NETPLAY_HOST_METHOD_MITM
? room->mitm_address : room->address,
room->host_method == NETPLAY_HOST_METHOD_MITM
? room->mitm_port : room->port);
RARCH_LOG("[discord] joining lobby at: %s\n", join_hostname);
task_push_netplay_crc_scan(room->gamecrc,
@ -399,25 +398,34 @@ void discord_update(enum discord_presence presence)
}
break;
case DISCORD_PRESENCE_NETPLAY_HOSTING:
room = netplay_get_host_room();
if (room->id == 0)
return;
RARCH_LOG("[discord] netplay room details: id=%d, nick=%s IP=%s port=%d\n",
room->id, room->nickname,
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address,
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port);
{
char join_secret[128];
struct netplay_room *room = netplay_get_host_room();
if (room->id == 0)
return;
snprintf(self_party_id, sizeof(self_party_id), "%d", room->id);
snprintf(join_secret, sizeof(join_secret), "%d|%" PRId64, room->id, cpu_features_get_time_usec());
discord_presence.joinSecret = strdup(join_secret);
/* discord_presence.spectateSecret = "SPECSPECSPEC"; */
discord_presence.partyId = strdup(self_party_id);
discord_presence.partyMax = 2;
discord_presence.partySize = 1;
RARCH_LOG("[discord] netplay room details: id=%d"
", nick=%s IP=%s port=%d\n",
room->id, room->nickname,
room->host_method == NETPLAY_HOST_METHOD_MITM
? room->mitm_address : room->address,
room->host_method == NETPLAY_HOST_METHOD_MITM
? room->mitm_port : room->port);
snprintf(self_party_id,
sizeof(self_party_id), "%d", room->id);
snprintf(join_secret,
sizeof(join_secret), "%d|%" PRId64,
room->id, cpu_features_get_time_usec());
discord_presence.joinSecret = strdup(join_secret);
#if 0
discord_presence.spectateSecret = "SPECSPECSPEC";
#endif
discord_presence.partyId = strdup(self_party_id);
discord_presence.partyMax = 2;
discord_presence.partySize = 1;
RARCH_LOG("[discord] join secret: %s\n", join_secret);
RARCH_LOG("[discord] party id: %s\n", self_party_id);
@ -485,10 +493,12 @@ void discord_init(void)
else
{
path_basedir(full_path);
snprintf(command, sizeof(command), "%s%s", full_path, get_retroarch_launch_arguments());
snprintf(command, sizeof(command), "%s%s",
full_path, get_retroarch_launch_arguments());
}
#else
snprintf(command, sizeof(command), "sh -c %s", get_retroarch_launch_arguments());
snprintf(command, sizeof(command), "sh -c %s",
get_retroarch_launch_arguments());
#endif
RARCH_LOG("[discord] registering startup command: %s\n", command);
Discord_Register(settings->arrays.discord_app_id, command);