X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetserv.c;h=11fd9bc864c4bb528f62c00f776bc23c1b65d894;hb=35a55f8aa20694a478ab6e70057167014661469b;hp=178e89e3265831a271b365e87be66a148264103f;hpb=0a87fde47bcff35f196024766f8d0d00319a28d1;p=rocksndiamonds.git

diff --git a/src/netserv.c b/src/netserv.c
index 178e89e3..11fd9bc8 100644
--- a/src/netserv.c
+++ b/src/netserv.c
@@ -1,32 +1,33 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  network.c                                               *
+* network.c                                                *
 ***********************************************************/
 
-#ifndef MSDOS
+#include "libgame/platform.h"
+
+#if defined(PLATFORM_UNIX)
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <string.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include "libgame/libgame.h"
+
 #include "netserv.h"
-#include "misc.h"
 
 static int clients = 0;
 static int onceonly = 0;
@@ -34,7 +35,7 @@ static int onceonly = 0;
 struct NetworkServerPlayerInfo
 {
   int fd;
-  unsigned char player_name[16];
+  char player_name[16];
   unsigned char number;
   struct NetworkServerPlayerInfo *next;
   char active;
@@ -283,7 +284,8 @@ static void Handle_OP_PLAYER_NAME(struct NetworkServerPlayerInfo *player,
   for (i=0; i<len-2; i++)
   {
     if (player->player_name[i] < ' ' || 
-	(player->player_name[i] > 0x7e && player->player_name[i] <= 0xa0))
+	((unsigned char)(player->player_name[i]) > 0x7e &&
+	 (unsigned char)(player->player_name[i]) <= 0xa0))
     {
       player->player_name[i] = 0;
       break;
@@ -348,7 +350,7 @@ static void Handle_OP_START_PLAYING(struct NetworkServerPlayerInfo *player)
     v->action_received = FALSE;
   }
 
-  broadcast(NULL, 10 + strlen(&buffer[10])+1, 0);
+  broadcast(NULL, 10 + strlen((char *)&buffer[10])+1, 0);
 }
 
 static void Handle_OP_PAUSE_PLAYING(struct NetworkServerPlayerInfo *player)
@@ -375,7 +377,7 @@ static void Handle_OP_STOP_PLAYING(struct NetworkServerPlayerInfo *player)
   broadcast(NULL, 2, 0);
 }
 
-static void Handle_OP_MOVE_FIGURE(struct NetworkServerPlayerInfo *player)
+static void Handle_OP_MOVE_PLAYER(struct NetworkServerPlayerInfo *player)
 {
   struct NetworkServerPlayerInfo *v;
   int last_client_nr = 0;
@@ -475,7 +477,7 @@ void NetworkServer(int port, int serveronly)
   if (is_daemon)
   {
     /* become a daemon, breaking all ties with the controlling terminal */
-    options.verbose = 0;
+    options.verbose = FALSE;
     for (i=0; i<255; i++)
     {
       if (i != lfd)
@@ -633,8 +635,8 @@ void NetworkServer(int port, int serveronly)
 	      Handle_OP_STOP_PLAYING(player);
 	      break;
 
-	    case OP_MOVE_FIGURE:
-	      Handle_OP_MOVE_FIGURE(player);
+	    case OP_MOVE_PLAYER:
+	      Handle_OP_MOVE_PLAYER(player);
 	      break;
 
 	    case OP_BROADCAST_MESSAGE:
@@ -661,4 +663,4 @@ void NetworkServer(int port, int serveronly)
   }
 }
 
-#endif /* !MSDOS */
+#endif /* PLATFORM_UNIX */