added waiting for key or button after starting or stopping network mode

[rocksndiamonds.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 226ce34cce0b98ee65d5572dd3268536781129b7..e1bce45a459a58196f664774523e22f657e2fc69 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -142,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;
 
@@ -284,7 +284,16 @@ boolean ConnectToServer(char *hostname, int port)
     SDLNet_ResolveHost(&ip, hostname, port);
 
     if (ip.host == INADDR_NONE)
-      Error(ERR_EXIT, "cannot locate host '%s'", hostname);
+    {
+      char message[100];
+
+      sprintf(message, "Failed to resolve network server hostname '%s'!",
+             hostname);
+
+      DrawNetworkText_Failed(message);
+
+      return FALSE;
+    }
     else
       server_host = SDLNet_Read32(&ip.host);
 
@@ -1050,7 +1059,4 @@ void DisconnectFromNetworkServer(void)
   HandleNetworkingDisconnect();
 
   DrawNetworkText_Success("Successfully disconnected!");
-
-  /* short time to recognize result of network initialization */
-  Delay_WithScreenUpdates(1000);
 }