mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added simple (cheesy) announcements on join/leave

Browse Source
This commit is contained in:
Gregor Richards 2016-12-12 18:39:45 -05:00
parent 727743aa7b
commit 3d34c0222f
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
network/netplay/netplay.c
View File

@ -635,6 +635,7 @@ static bool netplay_get_cmd(netplay_t *netplay,
uint32_t flip_frame; uint32_t flip_frame;
uint32_t cmd_size; uint32_t cmd_size;
ssize_t recvd; ssize_t recvd;
char msg[512];
/* We don't handle the initial handshake here */ /* We don't handle the initial handshake here */
switch (connection->mode) switch (connection->mode)
@ -830,6 +831,12 @@ static bool netplay_get_cmd(netplay_t *netplay,
/* Tell everyone */ /* Tell everyone */
payload[1] = htonl(connection->player); payload[1] = htonl(connection->player);
netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_MODE, payload, sizeof(payload)); netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_MODE, payload, sizeof(payload));
/* Announce it */
msg[sizeof(msg)-1] = '\0';
snprintf(msg, sizeof(msg)-1, "Player %d has left", connection->player+1);
RARCH_LOG("%s\n", msg);
runloop_msg_queue_push(msg, 1, 180, false);
} }
else else
{ {
@ -875,6 +882,13 @@ static bool netplay_get_cmd(netplay_t *netplay,
/* Tell everyone */ /* Tell everyone */
payload[1] = htonl(NETPLAY_CMD_MODE_BIT_PLAYING | connection->player); payload[1] = htonl(NETPLAY_CMD_MODE_BIT_PLAYING | connection->player);
netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_MODE, payload, sizeof(payload)); netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_MODE, payload, sizeof(payload));
/* Announce it */
msg[sizeof(msg)-1] = '\0';
snprintf(msg, sizeof(msg)-1, "Player %d has joined", player+1);
RARCH_LOG("%s\n", msg);
runloop_msg_queue_push(msg, 1, 180, false);
} }
/* Tell the player even if they were confused */ /* Tell the player even if they were confused */
@ -894,6 +908,7 @@ static bool netplay_get_cmd(netplay_t *netplay,
uint32_t frame, mode, player; uint32_t frame, mode, player;
size_t ptr; size_t ptr;
struct delta_frame *dframe; struct delta_frame *dframe;
#define START(which) \ #define START(which) \
do { \ do { \
ptr = which; \ ptr = which; \
@ -973,6 +988,12 @@ static bool netplay_get_cmd(netplay_t *netplay,
} }
/* Announce it */
msg[sizeof(msg)-1] = '\0';
snprintf(msg, sizeof(msg)-1, "You have joined as player %d", player+1);
RARCH_LOG("%s\n", msg);
runloop_msg_queue_push(msg, 1, 180, false);
} }
else /* YOU && !PLAYING */ else /* YOU && !PLAYING */
{ {
@ -980,6 +1001,11 @@ static bool netplay_get_cmd(netplay_t *netplay,
if (netplay->self_mode != NETPLAY_CONNECTION_SPECTATING) if (netplay->self_mode != NETPLAY_CONNECTION_SPECTATING)
return netplay_cmd_nak(netplay, connection); return netplay_cmd_nak(netplay, connection);
/* Announce it */
strlcpy(msg, "You have left the game", sizeof(msg));
RARCH_LOG("%s\n", msg);
runloop_msg_queue_push(msg, 1, 180, false);
} }
} }
@ -995,10 +1021,23 @@ static bool netplay_get_cmd(netplay_t *netplay,
netplay->read_ptr[player] = netplay->server_ptr; netplay->read_ptr[player] = netplay->server_ptr;
netplay->read_frame_count[player] = netplay->server_frame_count; netplay->read_frame_count[player] = netplay->server_frame_count;
/* Announce it */
msg[sizeof(msg)-1] = '\0';
snprintf(msg, sizeof(msg)-1, "Player %d has joined", player+1);
RARCH_LOG("%s\n", msg);
runloop_msg_queue_push(msg, 1, 180, false);
} }
else else
{ {
netplay->connected_players &= ~(1<<player); netplay->connected_players &= ~(1<<player);
/* Announce it */
msg[sizeof(msg)-1] = '\0';
snprintf(msg, sizeof(msg)-1, "Player %d has left", player+1);
RARCH_LOG("%s\n", msg);
runloop_msg_queue_push(msg, 1, 180, false);
} }
} }