X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetserv.c;h=636fbf236c484edfee5c5a86f8eb83216d7e4679;hp=9ed0291c5d43745741b974c46fa08d915e1e1208;hb=HEAD;hpb=7f8f5498ebbb9cbfd0857dce7e53b64bf6603aa4

diff --git a/src/netserv.c b/src/netserv.c
index 9ed0291c..636fbf23 100644
--- a/src/netserv.c
+++ b/src/netserv.c
@@ -385,19 +385,19 @@ void dumpNetworkBuffer(struct NetworkBuffer *nb)
 {
   int i;
 
-  Print("::: network buffer maximum size: %d\n", nb->max_size);
-  Print("::: network buffer size:         %d\n", nb->size);
-  Print("::: network buffer position    : %d\n", nb->pos);
+  Debug("network:buffer", "network buffer maximum size: %d\n", nb->max_size);
+  Debug("network:buffer", "network buffer size:         %d\n", nb->size);
+  Debug("network:buffer", "network buffer position    : %d\n", nb->pos);
 
   for (i = 0; i < nb->size; i++)
   {
     if ((i % 16) == 0)
-      Print("\n::: ");
+      DebugContinued("network:buffer", "\n");
 
-    Print("%02x ", nb->buffer[i]);
+    DebugContinued("", "%02x ", nb->buffer[i]);
   }
 
-  Print("\n");
+  DebugContinued("network:buffer", "\n");
 }
 
 static void SendNetworkBufferToAllButOne(struct NetworkBuffer *nb,
@@ -864,28 +864,22 @@ void NetworkServer(int port, int serveronly)
 #endif
 
   if (SDLNet_ResolveHost(&ip, NULL, port) == -1)
-    Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_ResolveHost() failed: %s",
-          SDLNet_GetError());
+    Fail("SDLNet_ResolveHost() failed: %s", SDLNet_GetError());
 
   if ((fds = SDLNet_AllocSocketSet(MAX_PLAYERS + 1 + 1)) == NULL)
-    Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_AllocSocketSet() failed: %s"),
-      SDLNet_GetError();
+    Fail("SDLNet_AllocSocketSet() failed: %s"), SDLNet_GetError();
 
   if ((lfd = SDLNet_TCP_Open(&ip)) == NULL)
-    Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_TCP_Open() failed: %s"),
-      SDLNet_GetError();
+    Fail("SDLNet_TCP_Open() failed: %s"), SDLNet_GetError();
 
   if (SDLNet_TCP_AddSocket(fds, lfd) == -1)
-    Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_TCP_AddSocket() failed: %s"),
-      SDLNet_GetError();
+    Fail("SDLNet_TCP_AddSocket() failed: %s"), SDLNet_GetError();
 
   if ((udp = SDLNet_UDP_Open(port)) == NULL)
-    Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_UDP_Open() failed: %s",
-          SDLNet_GetError());
+    Fail("SDLNet_UDP_Open() failed: %s", SDLNet_GetError());
 
   if (SDLNet_UDP_AddSocket(fds, udp) == -1)
-    Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_TCP_AddSocket() failed: %s"),
-      SDLNet_GetError();
+    Fail("SDLNet_TCP_AddSocket() failed: %s"), SDLNet_GetError();
 
   Debug("network:server", "started up, listening on port %d", port);
   Debug("network:server", "using protocol version %d.%d.%d",