X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=2b0ac6c205ecf7a9cafe378e1c95f733405b4ee0;hb=c9433eab5c4317ed4f89164b386a7d33562e29be;hp=5d137f0598f3514e1c824c6e40664055cd6a6070;hpb=0918c3eb2f6219a8cc72aa85bd9c4889788dd474;p=rocksndiamonds.git

diff --git a/src/network.c b/src/network.c
index 5d137f05..2b0ac6c2 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1,19 +1,20 @@
 /***********************************************************
-*  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 <signal.h>
 #include <sys/time.h>
 #include <sys/wait.h>
@@ -23,22 +24,20 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include "libgame/libgame.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"
-
-#define MAX_PLAYER_NAME_LEN 14
 
 struct NetworkClientPlayerInfo
 {
   byte nr;
-  char name[MAX_PLAYER_NAME_LEN + 2];
+  char name[MAX_PLAYER_NAME_LEN + 1];
   struct NetworkClientPlayerInfo *next;
 };
 
@@ -225,20 +224,23 @@ void SendToServer_StartPlaying()
 {
   unsigned long new_random_seed = InitRND(NEW_RANDOMIZE);
 
+  int dummy = 0;		/* !!! HAS NO MEANING ANYMORE !!! */
+				/* the name of the level must be enough */
+
   buffer[1] = OP_START_PLAYING;
   buffer[2] = (byte)(level_nr >> 8);
   buffer[3] = (byte)(level_nr & 0xff);
-  buffer[4] = (byte)(leveldir_nr >> 8);
-  buffer[5] = (byte)(leveldir_nr & 0xff);
+  buffer[4] = (byte)(dummy >> 8);
+  buffer[5] = (byte)(dummy & 0xff);
 
   buffer[6] = (unsigned char)((new_random_seed >> 24) & 0xff);
   buffer[7] = (unsigned char)((new_random_seed >> 16) & 0xff);
   buffer[8] = (unsigned char)((new_random_seed >>  8) & 0xff);
   buffer[9] = (unsigned char)((new_random_seed >>  0) & 0xff);
 
-  strcpy((char *)&buffer[10], leveldir[leveldir_nr].name);
+  strcpy((char *)&buffer[10], leveldir_current->filename);
 
-  SendBufferToServer(10 + strlen(leveldir[leveldir_nr].name)+1);
+  SendBufferToServer(10 + strlen(leveldir_current->filename) + 1);
 }
 
 void SendToServer_PausePlaying()
@@ -411,25 +413,33 @@ static void Handle_OP_PLAYER_DISCONNECTED()
 
 static void Handle_OP_START_PLAYING()
 {
-  int new_level_nr, new_leveldir_nr;
+  LevelDirTree *new_leveldir;
+  int new_level_nr;
+  int dummy;				/* !!! HAS NO MEANING ANYMORE !!! */
   unsigned long new_random_seed;
-  char *new_leveldir_name;
+  char *new_leveldir_filename;
 
   new_level_nr = (buffer[2] << 8) + buffer[3];
-  new_leveldir_nr = (buffer[4] << 8) + buffer[5];
+  dummy = (buffer[4] << 8) + buffer[5];
   new_random_seed =
     (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]);
-  new_leveldir_name = (char *)&buffer[10];
+  new_leveldir_filename = (char *)&buffer[10];
+
+  new_leveldir = getTreeInfoFromFilename(leveldir_first,new_leveldir_filename);
+  if (new_leveldir == NULL)
+  {
+    Error(ERR_WARN, "no such level directory: '%s'", new_leveldir_filename);
+
+    new_leveldir = leveldir_first;
+    Error(ERR_WARN, "using default level directory: '%s'", new_leveldir->name);
+  }
 
   printf("OP_START_PLAYING: %d\n", buffer[0]);
   Error(ERR_NETWORK_CLIENT,
-	"client %d starts game [level %d from levedir %d (%s)]\n",
-	buffer[0], new_level_nr, new_leveldir_nr, new_leveldir_name);
-
-  if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0)
-    Error(ERR_WARN, "no such level directory: '%s'",new_leveldir_name);
+	"client %d starts game [level %d from leveldir '%s']\n",
+	buffer[0], new_level_nr, new_leveldir->name);
 
-  leveldir_nr = new_leveldir_nr;
+  leveldir_current = new_leveldir;
   level_nr = new_level_nr;
 
   TapeErase();
@@ -607,4 +617,4 @@ void HandleNetworking()
   }
 }
 
-#endif /* !MSDOS */
+#endif /* PLATFORM_UNIX */