diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 4e434843e0..c22e075df1 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -11527,6 +11527,10 @@ MSG_HASH( MSG_NETPLAY_STATUS_SPECTATING, "Spectating" ) +MSG_HASH( + MSG_NETPLAY_CHAT_SUPPORTED, + "Chat Supported" + ) MSG_HASH( MSG_AUDIO_VOLUME, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index a3aa7f6c0e..1d8a56144c 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -1613,15 +1613,22 @@ static int action_bind_sublabel_netplay_kick_client(file_list_t *list, if (status) { - snprintf(buf, sizeof(buf), "%s: %s", + snprintf(buf, sizeof(buf), "%s: %s\n", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_STATUS), status); strlcat(s, buf, len); } + + snprintf(buf, sizeof(buf), "%s: %s", + msg_hash_to_str(MSG_NETPLAY_CHAT_SUPPORTED), + msg_hash_to_str((client->protocol >= 6) ? + MENU_ENUM_LABEL_VALUE_YES : + MENU_ENUM_LABEL_VALUE_NO)); + strlcat(s, buf, len); + if (client->ping >= 0) { - if (*s) - strlcat(s, "\n", len); - snprintf(buf, sizeof(buf), "Ping: %u", (unsigned)client->ping); + snprintf(buf, sizeof(buf), "\nPing: %u", + (unsigned)client->ping); strlcat(s, buf, len); } diff --git a/msg_hash.h b/msg_hash.h index d195531b21..047358fecf 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -220,6 +220,7 @@ enum msg_hash_enums MSG_NETPLAY_FAILED_TO_KICK_CLIENT_S, MSG_NETPLAY_STATUS_PLAYING, MSG_NETPLAY_STATUS_SPECTATING, + MSG_NETPLAY_CHAT_SUPPORTED, MSG_RESAMPLER_QUALITY_LOWEST, MSG_RESAMPLER_QUALITY_LOWER, MSG_RESAMPLER_QUALITY_NORMAL, diff --git a/network/netplay/netplay.h b/network/netplay/netplay.h index 7d81f142f6..93cc3888fd 100644 --- a/network/netplay/netplay.h +++ b/network/netplay/netplay.h @@ -142,6 +142,7 @@ typedef struct netplay netplay_t; typedef struct netplay_client_info { + uint32_t protocol; int32_t ping; int id; enum rarch_netplay_connection_mode mode; diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index 6f009072c8..620e45bcda 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -8505,8 +8505,9 @@ static size_t retrieve_client_info(netplay_t *netplay, netplay_client_info_t *bu netplay_client_info_t *info = &buf[j++]; info->id = (int)i; strlcpy(info->name, connection->nick, sizeof(info->name)); - info->mode = connection->mode; - info->ping = connection->ping; + info->protocol = connection->netplay_protocol; + info->mode = connection->mode; + info->ping = connection->ping; } }