rnd-19981017-1
[rocksndiamonds.git] / src / network.c
index 17ca60d1c637b2540a276d69b35a09d602a83242..092de4d0a3d55819e61c87d3a3e0601b2be4f4d9 100644 (file)
 #include <errno.h>
 
 #include "network.h"
+#include "netserv.h"
 #include "game.h"
 #include "tape.h"
 #include "files.h"
 #include "tools.h"
+#include "buttons.h"
+#include "screens.h"
 #include "misc.h"
 
-int norestart = 0;
-int nospeedup = 0;
-
-#define DEFAULTPORT 19503
-
-#define PROT_VERS_1 1
-#define PROT_VERS_2 0
-#define PROT_VERS_3 1
-
-#define OP_NICK 1
-#define OP_PLAY 2
-#define OP_MOVE 3
-#define OP_NRWANTED 4
-#define OP_LOST 5
-#define OP_GONE 6
-#define OP_CLEAR 7
-#define OP_NEW 8
-#define OP_LINES 9
-#define OP_GROW 10
-#define OP_MODE 11
-#define OP_LEVEL 12
-#define OP_BOT 13
-#define OP_KILL 14
-#define OP_PAUSE 15
-#define OP_CONT 16
-#define OP_VERSION 17
-#define OP_BADVERS 18
-#define OP_MSG 19
-#define OP_YOUARE 20
-#define OP_LINESTO 21
-#define OP_WON 22
-#define OP_ZERO 23
-
 #define MAXNICKLEN 14
 
 struct user
@@ -81,48 +51,25 @@ struct user me =
   NULL
 };
 
-/* server stuff */
+static char msgbuf[300];
 
-#define BUFLEN         4096
+/* server stuff */
 
 int sfd;
-unsigned char realbuf[512], readbuf[BUFLEN], writbuf[BUFLEN];
+unsigned char realbuf[512], readbuf[MAX_BUFFER_SIZE], writbuf[MAX_BUFFER_SIZE];
 unsigned char *buf = realbuf + 4;
 int nread = 0, nwrite = 0;
 
-/* like memcpy, but guaranteed to handle overlap when s <= t */
-void copydown(char *s, char *t, int n)
-{
-  for (; n; n--)
-    *(s++) = *(t++);
-}
-
-void sysmsg(char *s)
+static void sysmsg(char *s)
 {
-  if (verbose)
+  if (options.verbose)
   {
     printf("** %s\n", s);
     fflush(stdout);
   }
 }
 
-void fatal(char *s)
-{
-  fprintf(stderr, "%s.\n", s);
-  exit(1);
-}
-
-void *mmalloc(int n)
-{
-  void *r;
-
-  r = malloc(n);
-  if (r == NULL)
-    fatal("Out of memory");
-  return r;
-}
-
-void u_sleep(int i)
+static void u_sleep(int i)
 {
   struct timeval tm;
   tm.tv_sec = i / 1000000;
@@ -130,7 +77,7 @@ void u_sleep(int i)
   select(0, NULL, NULL, NULL, &tm);
 }
 
-void flushbuf()
+static void flushbuf()
 {
   if (nwrite)
   {
@@ -139,17 +86,22 @@ void flushbuf()
   }
 }
 
-void sendbuf(int len)
+static void sendbuf(int len)
 {
-  if (!standalone)
+  if (options.network)
   {
     realbuf[0] = realbuf[1] = realbuf[2] = 0;
     realbuf[3] = (unsigned char)len;
     buf[0] = 0;
-    if (nwrite + 4 + len >= BUFLEN)
-      fatal("Internal error: send buffer overflow");
+    if (nwrite + 4 + len >= MAX_BUFFER_SIZE)
+      Error(ERR_EXIT, "internal error: network send buffer overflow");
     memcpy(writbuf + nwrite, realbuf, 4 + len);
     nwrite += 4 + len;
+
+
+    flushbuf();
+
+
   }
 }
 
@@ -161,7 +113,8 @@ struct user *finduser(unsigned char c)
     if (u->nr == c)
       return u;
   
-  fatal("Protocol error: reference to non-existing user");
+  Error(ERR_EXIT, "protocol error: reference to non-existing user %d", c);
+
   return NULL; /* so that gcc -Wall doesn't complain */
 }
 
@@ -181,47 +134,29 @@ char *get_user_name(unsigned char c)
   return("no name");
 }
 
-void startserver()
+static void StartNetworkServer(int port)
 {
-  char *options[2];
-  int n = 0;
-
-  options[0] = options[1] = NULL;
-  if (verbose)
-    options[n++] = "-v";
-  if (nospeedup)
-    options[n++] = "-nospeedup";
-
   switch (fork())
   {
     case 0:
-      execlp(
-#ifdef XTRISPATH
-      XTRISPATH "/rnd_server",
-#else
-      "rnd_server",
-#endif
-      "rnd_server", "-once", options[0], options[1], NULL);
-
-      fprintf(stderr, "Can't start server '%s'.\n",
-#ifdef XTRISPATH
-       XTRISPATH "/rnd_server"
-#else
-       "rnd_server"
-#endif
-             );
-
-      _exit(1);
-    
+      NetworkServer(port, options.serveronly);
+
+      /* never reached */
+      exit(0);
+
     case -1:
-      fatal("fork() failed");
-    
+      Error(ERR_RETURN,
+           "cannot create network server process - no network games");
+      options.network = FALSE;
+      return;
+
     default:
+      /* we are parent process -- resume normal operation */
       return;
   }
 }
 
-BOOL ConnectToServer(char *host, int port)
+boolean ConnectToServer(char *host, int port)
 {
   struct hostent *hp;
   struct sockaddr_in s;
@@ -234,7 +169,8 @@ BOOL ConnectToServer(char *host, int port)
     {
       hp = gethostbyname(host);
       if (!hp)
-       fatal("Host not found");
+       Error(ERR_EXIT, "cannot locate host '%s'", host);
+
       s.sin_addr = *(struct in_addr *)(hp->h_addr_list[0]);
     }
   }
@@ -246,9 +182,11 @@ BOOL ConnectToServer(char *host, int port)
 
   s.sin_port = htons(port);
   s.sin_family = AF_INET;
+
   sfd = socket(PF_INET, SOCK_STREAM, 0);
   if (sfd < 0)
-    fatal("Out of file descriptors");
+    Error(ERR_EXIT, "out of file descriptors");
+
   if ((tcpproto = getprotobyname("tcp")) != NULL)
     setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
 
@@ -257,23 +195,29 @@ BOOL ConnectToServer(char *host, int port)
     if (!host)
     {
       printf("No rocksndiamonds server on localhost - starting up one ...\n");
-      startserver();
+
+      StartNetworkServer(port);
+
       for (i=0; i<6; i++)
       {
        u_sleep(500000);
        close(sfd);
+
        sfd = socket(PF_INET, SOCK_STREAM, 0);
        if (sfd < 0)
-         fatal("Out of file descriptors");
-       setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
+         Error(ERR_EXIT, "out of file descriptors");
+
+       setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY,
+                  (char *)&on, sizeof(int));
+
        if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) >= 0)
          break;
       }
       if (i==6)
-       fatal("Can't connect to server");
+       Error(ERR_EXIT, "cannot connect to server");
     }
     else
-      fatal("Can't connect to server");
+      Error(ERR_EXIT, "cannot connect to server");
   }
 
   return(TRUE);
@@ -283,7 +227,7 @@ void SendToServer_Nickname(char *nickname)
 {
   static char msgbuf[300];
 
-  buf[1] = OP_NICK;
+  buf[1] = OP_NICKNAME;
   memcpy(&buf[2], nickname, strlen(nickname));
   sendbuf(2 + strlen(nickname));
   sprintf(msgbuf, "you set your nick to \"%s\"", nickname);
@@ -292,273 +236,408 @@ void SendToServer_Nickname(char *nickname)
 
 void SendToServer_ProtocolVersion()
 {
-  buf[1] = OP_VERSION;
+  buf[1] = OP_PROTOCOL_VERSION;
   buf[2] = PROT_VERS_1;
   buf[3] = PROT_VERS_2;
   buf[4] = PROT_VERS_3;
+
   sendbuf(5);
 }
 
 void SendToServer_NrWanted(int nr_wanted)
 {
-  buf[1] = OP_NRWANTED;
+  buf[1] = OP_NUMBER_WANTED;
   buf[2] = nr_wanted;
+
   sendbuf(3);
 }
 
 void SendToServer_StartPlaying()
 {
-  buf[1] = OP_PLAY;
+  unsigned long new_random_seed = InitRND(NEW_RANDOMIZE);
+
+  buf[1] = OP_START_PLAYING;
   buf[2] = (byte)(level_nr >> 8);
   buf[3] = (byte)(level_nr & 0xff);
   buf[4] = (byte)(leveldir_nr >> 8);
   buf[5] = (byte)(leveldir_nr & 0xff);
-  strcpy(&buf[6], leveldir[leveldir_nr].name);
-  sendbuf(strlen(leveldir[leveldir_nr].name)+1 + 6);
+
+  buf[6] = (unsigned char)((new_random_seed >> 24) & 0xff);
+  buf[7] = (unsigned char)((new_random_seed >> 16) & 0xff);
+  buf[8] = (unsigned char)((new_random_seed >>  8) & 0xff);
+  buf[9] = (unsigned char)((new_random_seed >>  0) & 0xff);
+
+  strcpy(&buf[10], leveldir[leveldir_nr].name);
+
+  sendbuf(10 + strlen(leveldir[leveldir_nr].name)+1);
+}
+
+void SendToServer_PausePlaying()
+{
+  buf[1] = OP_PAUSE_PLAYING;
+
+  sendbuf(2);
+}
+
+void SendToServer_ContinuePlaying()
+{
+  buf[1] = OP_CONTINUE_PLAYING;
+
+  sendbuf(2);
 }
 
-void SendToServer_MovePlayer(byte player_action, unsigned long frame_nr)
+void SendToServer_StopPlaying()
 {
-  buf[1] = OP_MOVE;
+  buf[1] = OP_STOP_PLAYING;
+
+  sendbuf(2);
+}
+
+void SendToServer_MovePlayer(byte player_action)
+{
+  buf[1] = OP_MOVE_FIGURE;
   buf[2] = player_action;
 
   sendbuf(3);
+}
 
-  /*
-  buf[3] = (byte)((frame_nr >> 24) & 0xff);
-  buf[4] = (byte)((frame_nr >> 16) & 0xff);
-  buf[5] = (byte)((frame_nr >>  8) & 0xff);
-  buf[6] = (byte)((frame_nr >>  0) & 0xff);
+static void Handle_OP_BAD_PROTOCOL_VERSION()
+{
+  Error(ERR_RETURN, "protocol version mismatch");
+  Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d",
+       buf[2], buf[3], PROT_VERS_1, PROT_VERS_2, PROT_VERS_3);
+}
 
-  sendbuf(7);
-  */
+static void Handle_OP_YOUR_NUMBER()
+{
+  int new_client_nr = buf[2];
+  int new_index_nr = new_client_nr - 1;
+  struct PlayerInfo *old_local_player = local_player;
+  struct PlayerInfo *new_local_player = &stored_player[new_index_nr];
 
-  /*
-  printf("%d: %x, %x, %x, %x\n", frame_nr, buf[3], buf[4], buf[5], buf[6]);
-  */
+  printf("OP_YOUR_NUMBER: %d\n", buf[0]);
+  me.nr = new_client_nr;
 
+  if (old_local_player != new_local_player)
+  {
+    /* copy existing player settings and change to new player */
 
+    *new_local_player = *old_local_player;
+    old_local_player->connected = FALSE;
+    old_local_player->local = FALSE;
 
-  flushbuf();
+    local_player = new_local_player;
+  }
 
+  TestPlayer = new_index_nr;
 
+  if (me.nr > MAX_PLAYERS)
+    Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS);
 
+  sprintf(msgbuf, "you get client # %d", new_client_nr);
+  sysmsg(msgbuf);
 }
 
-void handlemessages()
+static void Handle_OP_NUMBER_WANTED()
+{
+  int client_nr_wanted = buf[2];
+  int old_client_nr = buf[0];
+  int new_client_nr = buf[3];
+  int old_index_nr = old_client_nr - 1;
+  int new_index_nr = new_client_nr - 1;
+  int index_nr_wanted = client_nr_wanted - 1;
+  struct PlayerInfo *old_player = &stored_player[old_index_nr];
+  struct PlayerInfo *new_player = &stored_player[new_index_nr];
+
+  printf("OP_NUMBER_WANTED: %d\n", buf[0]);
+
+  if (new_client_nr == client_nr_wanted)       /* switching succeeded */
+  {
+    struct user *u;
+
+    if (old_client_nr != client_nr_wanted)     /* client's nr has changed */
+    {
+      sprintf(msgbuf, "client %d switches to # %d",
+             old_client_nr, new_client_nr);
+      sysmsg(msgbuf);
+    }
+    else if (old_client_nr == me.nr)           /* local player keeps his nr */
+    {
+      sprintf(msgbuf, "keeping client # %d", new_client_nr);
+      sysmsg(msgbuf);
+    }
+
+    if (old_client_nr != new_client_nr)
+    {
+      /* copy existing player settings and change to new player */
+
+      *new_player = *old_player;
+      old_player->connected = FALSE;
+      old_player->local = FALSE;
+    }
+
+    u = finduser(old_client_nr);
+    u->nr = new_client_nr;
+
+    if (old_player == local_player)            /* local player switched */
+      local_player = new_player;
+
+
+    TestPlayer = new_index_nr;
+  }
+  else if (old_client_nr == me.nr)             /* failed -- local player? */
+  {
+    char *color[] = { "yellow", "red", "green", "blue" };
+
+    sprintf(msgbuf, "Sorry ! %s player still exists ! You are %s player !",
+           color[index_nr_wanted], color[new_index_nr]);
+    Request(msgbuf, REQ_CONFIRM);
+
+    sprintf(msgbuf, "cannot switch -- you keep client # %d",
+           new_client_nr);
+    sysmsg(msgbuf);
+  }
+}
+
+static void Handle_OP_NICKNAME(unsigned int len)
+{
+  struct user *u;
+
+  printf("OP_NICKNAME: %d\n", buf[0]);
+  u = finduser(buf[0]);
+  buf[len] = 0;
+  sprintf(msgbuf, "client %d calls itself \"%s\"", buf[0], &buf[2]);
+  sysmsg(msgbuf);
+  strncpy(u->name, &buf[2], MAXNICKLEN);
+}
+
+static void Handle_OP_PLAYER_CONNECTED()
 {
-  unsigned int len;
   struct user *u, *v = NULL;
-  static char msgbuf[300];
+  int new_client_nr = buf[0];
+  int new_index_nr = new_client_nr - 1;
 
-  while (nread >= 4 && nread >= 4 + readbuf[3])
+  printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr);
+  sprintf(msgbuf, "new client %d connected", new_client_nr);
+  sysmsg(msgbuf);
+
+  for (u = &me; u; u = u->next)
   {
-    len = readbuf[3];
-    if (readbuf[0] || readbuf[1] || readbuf[2])
-      fatal("Wrong server line length");
+    if (u->nr == new_client_nr)
+      Error(ERR_EXIT, "multiplayer server sent duplicate player id");
+    else
+      v = u;
+  }
 
-    memcpy(buf, &readbuf[4], len);
-    nread -= 4 + len;
-    copydown(readbuf, readbuf + 4 + len, nread);
+  v->next = u = checked_malloc(sizeof(struct user));
+  u->nr = new_client_nr;
+  u->name[0] = '\0';
+  u->next = NULL;
 
-    switch(buf[1])
-    {
-      case OP_YOUARE:
-      {
-       int new_client_nr = buf[2];
-       int new_index_nr = new_client_nr - 1;
+  stored_player[new_index_nr].connected = TRUE;
+}
 
-       printf("OP_YOUARE: %d\n", buf[0]);
-       me.nr = new_client_nr;
+static void Handle_OP_PLAYER_DISCONNECTED()
+{
+  struct user *u, *v;
 
-       stored_player[new_index_nr] = *local_player;
-       local_player = &stored_player[new_index_nr];
+  printf("OP_PLAYER_DISCONNECTED: %d\n", buf[0]);
+  u = finduser(buf[0]);
+  sprintf(msgbuf, "client %d (%s) disconnected",
+         buf[0], get_user_name(buf[0]));
+  sysmsg(msgbuf);
 
-       TestPlayer = new_index_nr;
+  for (v = &me; v; v = v->next)
+    if (v->next == u)
+      v->next = u->next;
+  free(u);
+}
 
-       if (me.nr > MAX_PLAYERS)
-         Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS);
+static void Handle_OP_START_PLAYING()
+{
+  int new_level_nr, new_leveldir_nr;
+  unsigned long new_random_seed;
+  unsigned char *new_leveldir_name;
 
-       sprintf(msgbuf, "you get client # %d", new_client_nr);
-       sysmsg(msgbuf);
+  /*
+    if (game_status == PLAYING)
+    break;
+  */
 
-       break;
-      }
+  new_level_nr = (buf[2] << 8) + buf[3];
+  new_leveldir_nr = (buf[4] << 8) + buf[5];
+  new_random_seed =
+    (buf[6] << 24) | (buf[7] << 16) | (buf[8] << 8) | (buf[9]);
+  new_leveldir_name = &buf[10];
+
+  printf("OP_START_PLAYING: %d\n", buf[0]);
+  sprintf(msgbuf, "client %d starts game [level %d from levedir %d (%s)]\n",
+         buf[0],
+         new_level_nr,
+         new_leveldir_nr,
+         new_leveldir_name);
+  sysmsg(msgbuf);
 
-      case OP_NRWANTED:
-      {
-       int client_nr_wanted = buf[2];
-       int new_client_nr = buf[3];
-       int new_index_nr = new_client_nr - 1;
 
-       printf("OP_NRWANTED: %d\n", buf[0]);
+  if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0)
+    Error(ERR_RETURN, "no such level directory: '%s'",new_leveldir_name);
 
-       if (new_client_nr != client_nr_wanted)
-       {
-         char *color[] = { "yellow", "red", "green", "blue" };
+  leveldir_nr = new_leveldir_nr;
 
-         sprintf(msgbuf, "Sorry ! You are %s player !",
-                 color[new_index_nr]);
-         Request(msgbuf, REQ_CONFIRM);
+  local_player->leveldir_nr = leveldir_nr;
+  LoadPlayerInfo(PLAYER_LEVEL);
+  SavePlayerInfo(PLAYER_SETUP);
 
-         sprintf(msgbuf, "cannot switch -- you keep client # %d",
-                 new_client_nr);
-         sysmsg(msgbuf);
-       }
-       else
-       {
-         if (me.nr != client_nr_wanted)
-           sprintf(msgbuf, "switching to client # %d", new_client_nr);
-         else
-           sprintf(msgbuf, "keeping client # %d", new_client_nr);
-         sysmsg(msgbuf);
+  level_nr = new_level_nr;
 
-         me.nr = new_client_nr;
+  TapeErase();
+  LoadLevelTape(level_nr);
 
-         stored_player[new_index_nr] = *local_player;
-         local_player = &stored_player[new_index_nr];
+  GetPlayerConfig();
+  LoadLevel(level_nr);
 
-         TestPlayer = new_index_nr;
-       }
 
-       break;
-      }
 
-      case OP_NEW:
-       printf("OP_NEW: %d\n", buf[0]);
-       sprintf(msgbuf, "new client %d connected", buf[0]);
-       sysmsg(msgbuf);
+  if (setup.autorecord_on)
+    TapeStartRecording();
 
-       for (u = &me; u; u = u->next)
-       {
-         if (u->nr == buf[0])
-           Error(ERR_EXIT, "multiplayer server sent duplicate player id");
-         else
-           v = u;
-       }
 
-       v->next = u = mmalloc(sizeof(struct user));
-       u->nr = buf[0];
-       u->name[0] = '\0';
-       u->next = NULL;
 
-       break;
+  if (tape.recording)
+    tape.random_seed = new_random_seed;
 
-      case OP_NICK:
-       printf("OP_NICK: %d\n", buf[0]);
-       u = finduser(buf[0]);
-       buf[len] = 0;
-       sprintf(msgbuf, "client %d calls itself \"%s\"", buf[0], &buf[2]);
-       sysmsg(msgbuf);
-       strncpy(u->name, &buf[2], MAXNICKLEN);
-       break;
-      
-      case OP_GONE:
-       printf("OP_GONE: %d\n", buf[0]);
-       u = finduser(buf[0]);
-       sprintf(msgbuf, "client %d (%s) disconnected",
-               buf[0], get_user_name(buf[0]));
-       sysmsg(msgbuf);
+  InitRND(new_random_seed);
 
-       for (v = &me; v; v = v->next)
-         if (v->next == u)
-           v->next = u->next;
-       free(u);
 
-       break;
+  /*
+    printf("tape.random_seed == %d\n", tape.random_seed);
+  */
 
-      case OP_BADVERS:
-       Error(ERR_RETURN, "protocol version mismatch");
-       Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d",
-             buf[2], buf[3], PROT_VERS_1, PROT_VERS_2, PROT_VERS_3);
-       break;
+  game_status = PLAYING;
+  InitGame();
+}
 
-      case OP_PLAY:
-       printf("OP_PLAY: %d\n", buf[0]);
-       sprintf(msgbuf, "client %d starts game [level %d from levedir %d (%s)]\n",
-               buf[0],
-               (buf[2] << 8) + buf[3],
-               (buf[4] << 8) + buf[5],
-               &buf[6]);
-       sysmsg(msgbuf);
+static void Handle_OP_PAUSE_PLAYING()
+{
+  printf("OP_PAUSE_PLAYING: %d\n", buf[0]);
+  sprintf(msgbuf, "client %d pauses game", buf[0]);
+  sysmsg(msgbuf);
+
+  tape.pausing = TRUE;
+  DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0);
+}
+
+static void Handle_OP_CONTINUE_PLAYING()
+{
+  printf("OP_CONTINUE_PLAYING: %d\n", buf[0]);
+  sprintf(msgbuf, "client %d continues game", buf[0]);
+  sysmsg(msgbuf);
 
-       if (strcmp(leveldir[(buf[4] << 8) + buf[5]].name, &buf[6]) == 0)
-       {
-         leveldir_nr = (buf[4] << 8) + buf[5];
+  tape.pausing = FALSE;
+  DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
+}
+
+static void Handle_OP_STOP_PLAYING()
+{
+  printf("OP_STOP_PLAYING: %d\n", buf[0]);
+  sprintf(msgbuf, "client %d stops game", buf[0]);
+  sysmsg(msgbuf);
+
+  game_status = MAINMENU;
+  DrawMainMenu();
+}
 
-         local_player->leveldir_nr = leveldir_nr;
-         LoadPlayerInfo(PLAYER_LEVEL);
-         SavePlayerInfo(PLAYER_SETUP);
+static void Handle_OP_MOVE_FIGURE(unsigned int len)
+{
+  int frame_nr;
+  int i;
 
-         level_nr = (buf[2] << 8) + buf[3];
+  if (!network_playing)
+    return;
 
-         TapeErase();
-         LoadLevelTape(level_nr);
+  frame_nr =
+    (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]);
 
-         GetPlayerConfig();
-         LoadLevel(level_nr);
+  if (frame_nr != FrameCounter)
+  {
+    Error(ERR_RETURN, "client and servers frame counters out of sync");
+    Error(ERR_RETURN, "frame counter of client is %d", FrameCounter);
+    Error(ERR_RETURN, "frame counter of server is %d", frame_nr);
+    Error(ERR_EXIT,   "this should not happen -- please debug");
+  }
 
-         {
-           if (autorecord_on)
-             TapeStartRecording();
+  /* copy valid player actions */
+  for (i=0; i<MAX_PLAYERS; i++)
+    network_player_action[i] =
+      (i < len - 6 && stored_player[i].active ? buf[6 + i] : 0);
 
-           game_status = PLAYING;
-           InitGame();
-         }
-       }
-       else
-       {
-         Error(ERR_RETURN, "no such level directory: '%s'", &buf[6]);
-       }
-       break;
+  network_player_action_received = TRUE;
 
-      case OP_MOVE:
-      {
-       int frame_nr;
-       int i;
+  /*
+    sprintf(msgbuf, "frame %d: client %d moves player [0x%02x]",
+    FrameCounter, buf[0], buf[2]);
+    sysmsg(msgbuf);
+  */
+}
+
+static void HandleNetworkingMessages()
+{
+  unsigned int len;
+
+  while (nread >= 4 && nread >= 4 + readbuf[3])
+  {
+    len = readbuf[3];
+    if (readbuf[0] || readbuf[1] || readbuf[2])
+      Error(ERR_EXIT, "wrong network server line length");
 
-       frame_nr =
-         (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]);
+    memcpy(buf, &readbuf[4], len);
+    nread -= 4 + len;
+    memmove(readbuf, readbuf + 4 + len, nread);
 
-       for (i=0; i<MAX_PLAYERS; i++)
-       {
-         if (stored_player[i].active)
-           network_player_action[i] = buf[6 + i];
-       }
+    switch(buf[1])
+    {
+      case OP_BAD_PROTOCOL_VERSION:
+       Handle_OP_BAD_PROTOCOL_VERSION();
+       break;
 
-       network_player_action_stored = TRUE;
+      case OP_YOUR_NUMBER:
+       Handle_OP_YOUR_NUMBER();
+       break;
 
-       /*
-       printf("FrameCounter == %d, frame_nr = %d\n",
-              FrameCounter, frame_nr);
-       */
+      case OP_NUMBER_WANTED:
+       Handle_OP_NUMBER_WANTED();
+       break;
 
-       /*
-       if (buf[2])
-       */
+      case OP_NICKNAME:
+       Handle_OP_NICKNAME(len);
+       break;
 
+      case OP_PLAYER_CONNECTED:
+       Handle_OP_PLAYER_CONNECTED();
+       break;
+      
+      case OP_PLAYER_DISCONNECTED:
+       Handle_OP_PLAYER_DISCONNECTED();
+       break;
 
-       /*
-       printf("OP_MOVE: %d\n", buf[0]);
-       */
+      case OP_START_PLAYING:
+       Handle_OP_START_PLAYING();
+       break;
 
-       sprintf(msgbuf, "frame %d: client %d moves player [0x%02x]",
-               FrameCounter, buf[0], buf[2]);
-       sysmsg(msgbuf);
+      case OP_PAUSE_PLAYING:
+       Handle_OP_PAUSE_PLAYING();
+       break;
 
+      case OP_CONTINUE_PLAYING:
+       Handle_OP_CONTINUE_PLAYING();
        break;
-      }
 
-      case OP_PAUSE:
-       printf("OP_PAUSE: %d\n", buf[0]);
-       sprintf(msgbuf, "client %d pauses game", buf[0]);
-       sysmsg(msgbuf);
+      case OP_STOP_PLAYING:
+       Handle_OP_STOP_PLAYING();
        break;
 
-      case OP_CONT:
-       printf("OP_CONT: %d\n", buf[0]);
-       sprintf(msgbuf, "client %d continues game", buf[0]);
-       sysmsg(msgbuf);
+      case OP_MOVE_FIGURE:
+       Handle_OP_MOVE_FIGURE(len);
        break;
 
       case OP_WON:
@@ -599,9 +678,6 @@ void HandleNetworking()
   fd_set rfds;
   int r = 0;
 
-  if (standalone)
-    return;
-
   flushbuf();
 
   FD_ZERO(&rfds);
@@ -610,10 +686,7 @@ void HandleNetworking()
   r = select(sfd + 1, &rfds, NULL, NULL, &tv);
 
   if (r < 0 && errno != EINTR)
-  {
-    perror("select");
-    fatal("fatal: select() failed");
-  }
+    Error(ERR_EXIT, "HandleNetworking(): select() failed");
 
   if (r < 0)
     FD_ZERO(&rfds);
@@ -622,14 +695,16 @@ void HandleNetworking()
   {
     int r;
 
-    r = read(sfd, readbuf + nread, BUFLEN - nread);
+    r = read(sfd, readbuf + nread, MAX_BUFFER_SIZE - nread);
 
     if (r < 0)
-      fatal("Error reading from server");
+      Error(ERR_EXIT, "error reading from network server");
+
     if (r == 0)
-      fatal("Connection to server lost");
+      Error(ERR_EXIT, "connection to network server lost");
+
     nread += r;
 
-    handlemessages();
+    HandleNetworkingMessages();
   }
 }