static byte *buffer = realbuffer + 4;
static int nread = 0, nwrite = 0;
static boolean stop_network_game = FALSE;
+static boolean stop_network_client = FALSE;
+static char stop_network_client_message[MAX_OUTPUT_LINESIZE + 1];
static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize)
{
static void Handle_OP_BAD_PROTOCOL_VERSION()
{
Error(ERR_WARN, "protocol version mismatch");
- Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d",
+ Error(ERR_WARN, "server expects %d.%d.x instead of %d.%d.%d",
buffer[2], buffer[3],
PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3);
+
+ sprintf(stop_network_client_message, "Network protocol version mismatch! Server expects version %d.%d.x instead of %d.%d.%d!",
+ buffer[2], buffer[3],
+ PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3);
+
+ stop_network_client = TRUE;
}
static void Handle_OP_YOUR_NUMBER()
Error(ERR_EXIT, "sorry, more than %d players not allowed", MAX_PLAYERS);
Error(ERR_NETWORK_CLIENT, "you get client # %d", new_client_nr);
+
+ stored_player[new_index_nr].connected_network = TRUE;
}
static void Handle_OP_NUMBER_WANTED()
Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d",
new_client_nr);
}
+
+ if (game_status == GAME_MODE_MAIN)
+ DrawNetworkPlayers();
}
static void Handle_OP_PLAYER_NAME(unsigned int len)
DrawMainMenu();
}
+ else if (game_status == GAME_MODE_MAIN)
+ {
+ DrawNetworkPlayers();
+ }
}
static void Handle_OP_START_PLAYING()
{
Error(ERR_WARN, "no such level identifier: '%s'", new_leveldir_identifier);
- new_leveldir = leveldir_first;
- Error(ERR_WARN, "using default level set: '%s'", new_leveldir->identifier);
+ stop_network_game = TRUE;
+
+ return;
}
printf("OP_START_PLAYING: %d\n", buffer[0]);
printf("OP_PAUSE_PLAYING: %d\n", buffer[0]);
Error(ERR_NETWORK_CLIENT, "client %d pauses game", buffer[0]);
- tape.pausing = TRUE;
- DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0);
+ if (game_status == GAME_MODE_PLAYING)
+ {
+ tape.pausing = TRUE;
+ DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0);
+ }
}
static void Handle_OP_CONTINUE_PLAYING()
printf("OP_CONTINUE_PLAYING: %d\n", buffer[0]);
Error(ERR_NETWORK_CLIENT, "client %d continues game", buffer[0]);
- tape.pausing = FALSE;
- DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
+ if (game_status == GAME_MODE_PLAYING)
+ {
+ tape.pausing = FALSE;
+ DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
+ }
}
static void Handle_OP_STOP_PLAYING()
if (buffer[2] != NETWORK_STOP_BY_PLAYER || stopped_by_remote_player)
Request(message, REQ_CONFIRM | REQ_STAY_CLOSED);
- }
- SetGameStatus(GAME_MODE_MAIN);
+ SetGameStatus(GAME_MODE_MAIN);
- DrawMainMenu();
+ DrawMainMenu();
+ }
}
static void Handle_OP_MOVE_PLAYER(unsigned int len)
nread += num_bytes;
HandleNetworkingMessages();
+
+ if (stop_network_client)
+ return stop_network_client_message;
}
return NULL;
}
+static void FreeNetworkClientPlayerInfo(struct NetworkClientPlayerInfo *player)
+{
+ if (player == NULL)
+ return;
+
+ if (player->next)
+ FreeNetworkClientPlayerInfo(player->next);
+
+ checked_free(player);
+}
+
static void HandleNetworkingDisconnect()
{
int i;
for (i = 0; i < MAX_PLAYERS; i++)
stored_player[i].connected_network = FALSE;
+
+ FreeNetworkClientPlayerInfo(first_player.next);
+
+ first_player.nr = 0;
+ first_player.next = NULL;
}
void HandleNetworking()
else
{
Request(error_message, REQ_CONFIRM);
+
+ if (game_status == GAME_MODE_MAIN)
+ ClearNetworkPlayers();
}
}
}