X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=1d263b5a6b9c7587b3c6a877cf61b91d22633f0a;hp=d0c156198408b3af688b3f106119b9a9280af3b0;hb=4848f0bcd25bee8a7a4e48ae7d2a670bbc4e278d;hpb=a25ddbbb3b6ea120194a2e5f92d3907731950248 diff --git a/src/network.c b/src/network.c index d0c15619..1d263b5a 100644 --- a/src/network.c +++ b/src/network.c @@ -38,15 +38,6 @@ static struct NetworkClientPlayerInfo first_player = NULL }; -struct NetworkLevelFileInfo -{ - char *leveldir_identifier; - struct LevelFileInfo file_info; - struct LevelFileInfo tmpl_info; - boolean use_network_level_files; - boolean use_custom_template; -}; - /* server stuff */ static TCPsocket sfd; /* TCP server socket */ @@ -60,7 +51,7 @@ static boolean stop_network_game = FALSE; static boolean stop_network_client = FALSE; static char stop_network_client_message[MAX_OUTPUT_LINESIZE + 1]; -static struct NetworkLevelFileInfo network_level; +static struct NetworkLevelInfo network_level; static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize) { @@ -151,7 +142,7 @@ static void SendNetworkBufferToServer(struct NetworkBuffer *nb) SDLNet_TCP_Send(sfd, nb->buffer, nb->size); } -struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr) +static struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr) { struct NetworkClientPlayerInfo *player = NULL; @@ -182,6 +173,11 @@ char *getNetworkPlayerName(int player_nr) return(EMPTY_PLAYER_NAME); } +boolean hasStartedNetworkGame(void) +{ + return !network_level.use_network_level_files; +} + static boolean hasPathSeparator(char *s) { return (strchr(s, '/') != NULL); @@ -254,9 +250,9 @@ boolean ConnectToServer(char *hostname, int port) SDLNet_UDP_Send(udp, -1, &packet); - DrawNetworkText("Looking for local network server ..."); + DrawNetworkText("Looking for nearby network server ..."); - /* wait for any local network server to answer UDP broadcast */ + /* wait for any nearby network server to answer UDP broadcast */ for (i = 0; i < 5; i++) { if (SDLNet_CheckSockets(udp_socket_set, 0) == 1) @@ -265,9 +261,17 @@ boolean ConnectToServer(char *hostname, int port) if (num_packets == 1) { - DrawNetworkText_Success("Network server found!"); + char message[100]; server_host = SDLNet_Read32(&packet.address.host); + + sprintf(message, "Network server found at %d.%d.%d.%d!", + (server_host >> 24) & 0xff, + (server_host >> 16) & 0xff, + (server_host >> 8) & 0xff, + (server_host >> 0) & 0xff); + + DrawNetworkText_Success(message); } else { @@ -283,33 +287,52 @@ boolean ConnectToServer(char *hostname, int port) } if (server_host == 0) - DrawNetworkText_Failed("No network server found!"); + DrawNetworkText_Failed("No nearby network server found!"); } rfds = SDLNet_AllocSocketSet(1); if (hostname) { + char message[100]; + SDLNet_ResolveHost(&ip, hostname, port); if (ip.host == INADDR_NONE) - Error(ERR_EXIT, "cannot locate host '%s'", hostname); + { + sprintf(message, "Failed to resolve network server hostname '%s'!", + hostname); + + DrawNetworkText_Failed(message); + + return FALSE; + } else + { server_host = SDLNet_Read32(&ip.host); + } + + sprintf(message, "Connecting to network server host %s ...", hostname); - DrawNetworkText("Connecting to remote host ..."); + DrawNetworkText(message); } else { // if no hostname was given and no network server was auto-detected in the // local network, try to connect to a network server at the local host if (server_host == 0) + { server_host = 0x7f000001; /* 127.0.0.1 */ + DrawNetworkText("Looking for local network server ..."); + } + else + { + DrawNetworkText("Connecting to network server ..."); + } + SDLNet_Write32(server_host, &ip.host); SDLNet_Write16(port, &ip.port); - - DrawNetworkText("Connecting to local host ..."); } Error(ERR_DEBUG, "trying to connect to network server at %d.%d.%d.%d ...", @@ -330,7 +353,10 @@ boolean ConnectToServer(char *hostname, int port) } else { - DrawNetworkText_Failed("Failed to connect to network server!"); + if (hostname) + DrawNetworkText_Failed("Failed to connect to network server!"); + else + DrawNetworkText_Failed("No local network server found!"); printf("SDLNet_TCP_Open(): %s\n", SDLNet_GetError()); } @@ -347,16 +373,17 @@ boolean ConnectToServer(char *hostname, int port) { if ((sfd = SDLNet_TCP_Open(&ip))) /* connected */ { - DrawNetworkText_Success("Successfully connected!"); + DrawNetworkText_Success("Successfully connected to newly started network server!"); SDLNet_TCP_AddSocket(rfds, sfd); + return TRUE; } Delay_WithScreenUpdates(100); } - DrawNetworkText_Failed("Failed to connect to network server!"); + DrawNetworkText_Failed("Failed to connect to newly started network server!"); /* when reaching this point, connect to newly started server has failed */ return FALSE; @@ -373,7 +400,7 @@ void SendToServer_PlayerName(char *player_name) Error(ERR_NETWORK_CLIENT, "you set your player name to \"%s\"", player_name); } -void SendToServer_ProtocolVersion() +void SendToServer_ProtocolVersion(void) { initNetworkBufferForWriting(write_buffer, OP_PROTOCOL_VERSION, 0); @@ -393,7 +420,7 @@ void SendToServer_NrWanted(int nr_wanted) SendNetworkBufferToServer(write_buffer); } -void SendToServer_LevelFile() +void SendToServer_LevelFile(void) { initNetworkBufferForWriting(write_buffer, OP_LEVEL_FILE, 0); @@ -431,7 +458,7 @@ void SendToServer_LevelFile() #endif } -void SendToServer_StartPlaying() +void SendToServer_StartPlaying(void) { unsigned int new_random_seed = InitRND(level.random_seed); @@ -444,14 +471,14 @@ void SendToServer_StartPlaying() SendNetworkBufferToServer(write_buffer); } -void SendToServer_PausePlaying() +void SendToServer_PausePlaying(void) { initNetworkBufferForWriting(write_buffer, OP_PAUSE_PLAYING, 0); SendNetworkBufferToServer(write_buffer); } -void SendToServer_ContinuePlaying() +void SendToServer_ContinuePlaying(void) { initNetworkBufferForWriting(write_buffer, OP_CONTINUE_PLAYING, 0); @@ -476,7 +503,7 @@ void SendToServer_MovePlayer(byte player_action) SendNetworkBufferToServer(write_buffer); } -static void Handle_OP_BAD_PROTOCOL_VERSION() +static void Handle_OP_BAD_PROTOCOL_VERSION(void) { int protocol_version_major = getNetworkBuffer8BitInteger(read_buffer); int protocol_version_minor = getNetworkBuffer8BitInteger(read_buffer); @@ -499,7 +526,7 @@ static void Handle_OP_BAD_PROTOCOL_VERSION() stop_network_client = TRUE; } -static void Handle_OP_YOUR_NUMBER() +static void Handle_OP_YOUR_NUMBER(void) { int old_client_nr = getNetworkBuffer8BitInteger(read_buffer); int new_client_nr = getNetworkBuffer8BitInteger(read_buffer); @@ -531,7 +558,7 @@ static void Handle_OP_YOUR_NUMBER() stored_player[new_index_nr].connected_network = TRUE; } -static void Handle_OP_NUMBER_WANTED() +static void Handle_OP_NUMBER_WANTED(void) { int old_client_nr = getNetworkBuffer8BitInteger(read_buffer); int client_nr_wanted = getNetworkBuffer8BitInteger(read_buffer); @@ -590,7 +617,7 @@ static void Handle_OP_NUMBER_WANTED() DrawNetworkPlayers(); } -static void Handle_OP_PLAYER_NAME() +static void Handle_OP_PLAYER_NAME(void) { int player_nr = getNetworkBuffer8BitInteger(read_buffer); char *player_name = getNetworkBufferString(read_buffer); @@ -605,7 +632,7 @@ static void Handle_OP_PLAYER_NAME() player_nr, player->name); } -static void Handle_OP_PLAYER_CONNECTED() +static void Handle_OP_PLAYER_CONNECTED(void) { struct NetworkClientPlayerInfo *player, *last_player = NULL; int new_client_nr = getNetworkBuffer8BitInteger(read_buffer); @@ -631,7 +658,7 @@ static void Handle_OP_PLAYER_CONNECTED() stored_player[new_index_nr].connected_network = TRUE; } -static void Handle_OP_PLAYER_DISCONNECTED() +static void Handle_OP_PLAYER_DISCONNECTED(void) { struct NetworkClientPlayerInfo *player, *player_disconnected; int player_nr = getNetworkBuffer8BitInteger(read_buffer); @@ -669,7 +696,7 @@ static void Handle_OP_PLAYER_DISCONNECTED() } } -static void Handle_OP_START_PLAYING() +static void Handle_OP_START_PLAYING(void) { int player_nr = getNetworkBuffer8BitInteger(read_buffer); char *new_leveldir_identifier = getNetworkBufferString(read_buffer); @@ -699,23 +726,20 @@ static void Handle_OP_START_PLAYING() level_nr = new_level_nr; } - SetLevelSetInfo(new_leveldir_identifier, new_level_nr); - /* needed if level set of network game changed graphics, sounds or music */ ReloadCustomArtwork(0); TapeErase(); if (network_level.use_network_level_files) - LoadLevelFromNetwork(&network_level.file_info, - &network_level.tmpl_info); + LoadNetworkLevel(&network_level); else LoadLevel(level_nr); StartGameActions(FALSE, setup.autorecord, new_random_seed); } -static void Handle_OP_PAUSE_PLAYING() +static void Handle_OP_PAUSE_PLAYING(void) { int player_nr = getNetworkBuffer8BitInteger(read_buffer); @@ -729,7 +753,7 @@ static void Handle_OP_PAUSE_PLAYING() } } -static void Handle_OP_CONTINUE_PLAYING() +static void Handle_OP_CONTINUE_PLAYING(void) { int player_nr = getNetworkBuffer8BitInteger(read_buffer); @@ -743,7 +767,7 @@ static void Handle_OP_CONTINUE_PLAYING() } } -static void Handle_OP_STOP_PLAYING() +static void Handle_OP_STOP_PLAYING(void) { int client_nr = getNetworkBuffer8BitInteger(read_buffer); int cause_for_stopping = getNetworkBuffer8BitInteger(read_buffer); @@ -759,11 +783,12 @@ static void Handle_OP_STOP_PLAYING() boolean stopped_by_remote_player = (!client_player->connected_locally); char message[100]; - sprintf(message, (cause_for_stopping == NETWORK_STOP_BY_PLAYER ? - "Network game stopped by player %d!" : - cause_for_stopping == NETWORK_STOP_BY_ERROR ? - "Network game stopped due to internal error!" : - "Network game stopped!"), client_nr); + if (cause_for_stopping == NETWORK_STOP_BY_PLAYER) + sprintf(message, "Network game stopped by player %d!", client_nr); + else + sprintf(message, (cause_for_stopping == NETWORK_STOP_BY_ERROR ? + "Network game stopped due to internal error!" : + "Network game stopped!")); if (cause_for_stopping != NETWORK_STOP_BY_PLAYER || stopped_by_remote_player) @@ -775,7 +800,7 @@ static void Handle_OP_STOP_PLAYING() } } -static void Handle_OP_MOVE_PLAYER() +static void Handle_OP_MOVE_PLAYER(void) { int player_nr = getNetworkBuffer8BitInteger(read_buffer); int server_frame_counter = getNetworkBuffer32BitInteger(read_buffer); @@ -805,7 +830,7 @@ static void Handle_OP_MOVE_PLAYER() network_player_action_received = TRUE; } -static void Handle_OP_BROADCAST_MESSAGE() +static void Handle_OP_BROADCAST_MESSAGE(void) { int player_nr = getNetworkBuffer8BitInteger(read_buffer); @@ -813,7 +838,7 @@ static void Handle_OP_BROADCAST_MESSAGE() Error(ERR_NETWORK_CLIENT, "client %d sends message", player_nr); } -static void Handle_OP_LEVEL_FILE() +static void Handle_OP_LEVEL_FILE(void) { int player_nr = getNetworkBuffer8BitInteger(read_buffer); char *leveldir_identifier; @@ -883,7 +908,7 @@ static void Handle_OP_LEVEL_FILE() #endif } -static void HandleNetworkingMessage() +static void HandleNetworkingMessage(void) { stop_network_game = FALSE; @@ -958,7 +983,7 @@ static void HandleNetworkingMessage() SendToServer_StopPlaying(NETWORK_STOP_BY_ERROR); } -static char *HandleNetworkingPackets() +static char *HandleNetworkingPackets(void) { while (1) { @@ -1004,7 +1029,7 @@ static void FreeNetworkClientPlayerInfo(struct NetworkClientPlayerInfo *player) checked_free(player); } -static void HandleNetworkingDisconnect() +static void HandleNetworkingDisconnect(void) { int i; @@ -1027,8 +1052,12 @@ static void HandleNetworkingDisconnect() first_player.next = NULL; } -void HandleNetworking() +void HandleNetworking(void) { + /* do not handle any networking packets if request dialog is active */ + if (game.request_active) + return; + char *error_message = HandleNetworkingPackets(); if (error_message != NULL) @@ -1053,7 +1082,7 @@ void HandleNetworking() } } -void DisconnectFromNetworkServer() +void DisconnectFromNetworkServer(void) { DrawNetworkText_Title("Terminating Network"); DrawNetworkText("Disconnecting from network server ..."); @@ -1061,7 +1090,4 @@ void DisconnectFromNetworkServer() HandleNetworkingDisconnect(); DrawNetworkText_Success("Successfully disconnected!"); - - /* short time to recognize result of network initialization */ - Delay_WithScreenUpdates(1000); }