X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=ecafc3b848cc3932394cf38ebf9184248b621782;hb=1cacebfb41c20889c904155001a5b88ace962348;hp=27247acdb95fa296aba71e4163274e7de770ef31;hpb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 27247acd..ecafc3b8 100644
--- a/src/init.c
+++ b/src/init.c
@@ -12,10 +12,6 @@
 ***********************************************************/
 
 #include <signal.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
 #include "init.h"
 #include "misc.h"
@@ -26,6 +22,7 @@
 #include "joystick.h"
 #include "gfxload.h"
 #include "gifload.h"
+#include "network.h"
 
 #ifdef DEBUG
 /*
@@ -47,11 +44,11 @@ struct IconFileInfo
 
 static int sound_process_id = 0;
 
-static void InitServer(void);
 static void InitLevelAndPlayerInfo(void);
-static void InitDisplay(int, char **);
+static void InitNetworkServer(void);
+static void InitDisplay(void);
 static void InitSound(void);
-static void InitSoundProcess(void);
+static void InitSoundServer(void);
 static void InitWindow(int, char **);
 static void InitGfx(void);
 static void LoadGfx(int, struct PictureFileInfo *);
@@ -59,25 +56,18 @@ static void InitElementProperties(void);
 
 void OpenAll(int argc, char *argv[])
 {
-
-
-  /* TEST TEST TEST */
-  InitServer();
-  /* TEST TEST TEST */
-
-
   InitLevelAndPlayerInfo();
 
   InitCounter();
   InitSound();
-  InitSoundProcess();
+  InitSoundServer();
   InitJoystick();
   InitRND(NEW_RANDOMIZE);
 
-  signal(SIGINT, CloseAll);
-  signal(SIGTERM, CloseAll);
+  signal(SIGINT, CloseAllAndExit);
+  signal(SIGTERM, CloseAllAndExit);
 
-  InitDisplay(argc, argv);
+  InitDisplay();
   InitWindow(argc, argv);
 
   XMapWindow(display, window);
@@ -87,178 +77,64 @@ void OpenAll(int argc, char *argv[])
   InitElementProperties();
 
   DrawMainMenu();
-}
-
-
-
-/* TEST STUFF -------------------------------------------------------------- */
-
-int norestart = 0;
-int nospeedup = 0;
-
-/* server stuff */
-
-#define DEFAULTPORT	19503
-#define BUFLEN		4096
-
-int sfd;
-unsigned char realbuf[512], readbuf[BUFLEN], writbuf[BUFLEN];
-unsigned char *buf = realbuf + 4;
-int nread = 0, nwrite = 0;
 
-void fatal(char *s)
-{
-  fprintf(stderr, "%s.\n", s);
-  exit(1);
-}
-
-void u_sleep(int i)
-{
-  struct timeval tm;
-  tm.tv_sec = i / 1000000;
-  tm.tv_usec = i % 1000000;
-  select(0, NULL, NULL, NULL, &tm);
+  InitNetworkServer();
 }
 
-void startserver()
+void InitLevelAndPlayerInfo()
 {
-  char *options[2];
-  int n = 0;
-
-  options[0] = options[1] = NULL;
-  if (norestart)
-    options[n++] = "-norestart";
-  if (nospeedup)
-    options[n++] = "-nospeedup";
-
-  switch (fork())
-  {
-    case 0:
-      execlp(
-#ifdef XTRISPATH
-      XTRISPATH "/rnd_server",
-#else
-      "rnd_server",
-#endif
-      "rnd_server", "-once", "-v", options[0], options[1], NULL);
-
-      fprintf(stderr, "Can't start server '%s'.\n",
-#ifdef XTRISPATH
-	XTRISPATH "/xtserv");
-#else
-	"xtserv");
-#endif
-
-      _exit(1);
-    
-    case -1:
-      fatal("fork() failed");
-    
-    default:
-      return;
-  }
-}
+  local_player = &stored_player[0];
 
-void connect2server(char *host, int port)
-{
-  struct hostent *hp;
-  struct sockaddr_in s;
-  struct protoent *tcpproto;
-  int on = 1, i;
+  if (!LoadLevelInfo())			/* global level info */
+    Error(ERR_EXIT, NULL);
 
-  if (host)
-  {
-    if ((s.sin_addr.s_addr = inet_addr(host)) == -1)
-    {
-      hp = gethostbyname(host);
-      if (!hp)
-	fatal("Host not found");
-      s.sin_addr = *(struct in_addr *)(hp->h_addr_list[0]);
-    }
-  }
-  else
-    s.sin_addr.s_addr = inet_addr("127.0.0.1");
-
-  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");
-  if ((tcpproto = getprotobyname("tcp")) != NULL)
-    setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
-
-  if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) < 0)
-  {
-    if (!host)
-    {
-      printf("No xtris server on localhost - starting up one ...\n");
-      startserver();
-      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));
-	if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) >= 0)
-	  break;
-      }
-      if (i==6)
-	fatal("Can't connect to server");
-    }
-    else
-      fatal("Can't connect to server");
-  }
+  LoadPlayerInfo(PLAYER_SETUP);		/* global setup info */
+  LoadPlayerInfo(PLAYER_LEVEL);		/* level specific info */
 }
 
-void InitServer()
+void InitNetworkServer()
 {
-  if (server_port == 0)
-    server_port = DEFAULTPORT;
+  int nr_wanted;
 
-  connect2server(server_host, server_port);
-}
-
-/* TEST STUFF -------------------------------------------------------------- */
+  if (standalone)
+    return;
 
+  nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
 
+  if (!ConnectToServer(server_host, server_port))
+    Error(ERR_EXIT, "cannot connect to multiplayer server");
 
-void InitLevelAndPlayerInfo()
-{
-  local_player = &stored_player[0];
+  SendToServer_Nickname(local_player->alias_name);
+  SendToServer_ProtocolVersion();
 
-  if (!LoadLevelInfo())			/* global level info */
-    CloseAll();
-
-  LoadPlayerInfo(PLAYER_SETUP);		/* global setup info */
-  LoadPlayerInfo(PLAYER_LEVEL);		/* level specific info */
+  if (nr_wanted)
+    SendToServer_NrWanted(nr_wanted);
 }
 
 void InitSound()
 {
   int i;
 
-  if (sound_status==SOUND_OFF)
+  if (sound_status == SOUND_OFF)
     return;
 
 #ifndef MSDOS
   if (access(sound_device_name,W_OK)<0)
   {
-    fprintf(stderr,"%s: cannot access sound device - no sounds\n",progname);
-    sound_status=SOUND_OFF;
+    Error(ERR_RETURN, "cannot access sound device - no sounds");
+    sound_status = SOUND_OFF;
     return;
   }
 
-  if ((sound_device=open(sound_device_name,O_WRONLY))<0)
+  if ((sound_device = open(sound_device_name,O_WRONLY))<0)
   {
-    fprintf(stderr,"%s: cannot open sound device - no sounds\n",progname);
-    sound_status=SOUND_OFF;
+    Error(ERR_RETURN, "cannot open sound device - no sounds");
+    sound_status = SOUND_OFF;
     return;
   }
 
   close(sound_device);
-  sound_status=SOUND_AVAILABLE;
+  sound_status = SOUND_AVAILABLE;
 
 #ifdef VOXWARE
   sound_loops_allowed = TRUE;
@@ -269,7 +145,7 @@ void InitSound()
   sound_loops_on = TRUE;
 #endif
 
-  for(i=0;i<NUM_SOUNDS;i++)
+  for(i=0; i<NUM_SOUNDS; i++)
   {
 #ifdef MSDOS
   sprintf(sound_name[i], "%d", i+1);
@@ -277,34 +153,39 @@ void InitSound()
     Sound[i].name = sound_name[i];
     if (!LoadSound(&Sound[i]))
     {
-      sound_status=SOUND_OFF;
+      sound_status = SOUND_OFF;
       return;
     }
   }
 }
 
-void InitSoundProcess()
+void InitSoundServer()
 {
-  if (sound_status==SOUND_OFF)
+  if (sound_status == SOUND_OFF)
     return;
 
 #ifndef MSDOS
   if (pipe(sound_pipe)<0)
   {
-    fprintf(stderr,"%s: cannot create pipe - no sounds\n",progname);
-    sound_status=SOUND_OFF;
+    Error(ERR_RETURN, "cannot create pipe - no sounds");
+    sound_status = SOUND_OFF;
     return;
   }
 
-  if ((sound_process_id=fork())<0)
+  if ((sound_process_id = fork()) < 0)
   {       
-    fprintf(stderr,"%s: cannot create child process - no sounds\n",progname);
-    sound_status=SOUND_OFF;
+    Error(ERR_RETURN, "cannot create sound server process - no sounds");
+    sound_status = SOUND_OFF;
     return;
   }
 
   if (!sound_process_id)	/* we are child */
+  {
     SoundServer();
+
+    /* never reached */
+    exit(0);
+  }
   else				/* we are parent */
     close(sound_pipe[0]);	/* no reading from pipe needed */
 #else
@@ -314,22 +195,22 @@ void InitSoundProcess()
 
 void InitJoystick()
 {
-  if (global_joystick_status==JOYSTICK_OFF)
+  if (global_joystick_status == JOYSTICK_OFF)
     return;
 
 #ifndef MSDOS
   if (access(joystick_device_name[joystick_nr],R_OK)<0)
   {
-    fprintf(stderr,"%s: cannot access joystick device '%s'\n",
-	    progname,joystick_device_name[joystick_nr]);
+    Error(ERR_RETURN, "cannot access joystick device '%s'",
+	  joystick_device_name[joystick_nr]);
     joystick_status = JOYSTICK_OFF;
     return;
   }
 
-  if ((joystick_device=open(joystick_device_name[joystick_nr],O_RDONLY))<0)
+  if ((joystick_device = open(joystick_device_name[joystick_nr],O_RDONLY))<0)
   {
-    fprintf(stderr,"%s: cannot open joystick device '%s'\n",
-	    progname,joystick_device_name[joystick_nr]);
+    Error(ERR_RETURN, "cannot open joystick device '%s'",
+	  joystick_device_name[joystick_nr]);
     joystick_status = JOYSTICK_OFF;
     return;
   }
@@ -341,37 +222,16 @@ void InitJoystick()
 #endif
 }
 
-void InitDisplay(int argc, char *argv[])
+void InitDisplay()
 {
-  char *display_name = NULL;
   XVisualInfo vinfo_template, *vinfo;
   int num_visuals;
   unsigned int depth;
-  int i;
-
-  /* get X server to connect to, if given as an argument */
-  for (i=1;i<argc-1;i++)
-  {
-    char *dispstr="-display";
-    int len=MAX(strlen(dispstr),strlen(argv[i]));
-
-    if (len<4)
-      continue;
-    else if (!strncmp(argv[i],dispstr,len))
-    {
-      display_name=argv[i+1];
-      break;
-    }
-  }
 
   /* connect to X server */
-  if (!(display=XOpenDisplay(display_name)))
-  {
-    fprintf(stderr,"%s: cannot connect to X server %s\n", 
-	    progname, XDisplayName(display_name));
-    exit(-1);
-  }
-  
+  if (!(display = XOpenDisplay(display_name)))
+    Error(ERR_EXIT,"cannot connect to X server %s",XDisplayName(display_name));
+
   screen = DefaultScreen(display);
   visual = DefaultVisual(display, screen);
   depth  = DefaultDepth(display, screen);
@@ -458,22 +318,14 @@ void InitWindow(int argc, char *argv[])
 		  &icon_width,&icon_height,
 		  &icon_pixmap,&icon_hot_x,&icon_hot_y);
   if (!icon_pixmap)
-  {
-    fprintf(stderr, "%s: cannot read icon bitmap file '%s'.\n",
-	    progname,icon_filename);
-    exit(-1);
-  }
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
 
   sprintf(icon_filename,"%s/%s",GFX_PATH,icon_pic.picturemask_filename);
   XReadBitmapFile(display,window,icon_filename,
 		  &icon_width,&icon_height,
 		  &iconmask_pixmap,&icon_hot_x,&icon_hot_y);
   if (!iconmask_pixmap)
-  {
-    fprintf(stderr, "%s: cannot read icon bitmap file '%s'.\n",
-	    progname,icon_filename);
-    exit(-1);
-  }
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
 
   size_hints.width  = size_hints.min_width  = size_hints.max_width  = width;
   size_hints.height = size_hints.min_height = size_hints.max_height = height;
@@ -487,18 +339,10 @@ void InitWindow(int argc, char *argv[])
   }
 
   if (!XStringListToTextProperty(&window_name, 1, &windowName))
-  {
-    fprintf(stderr, "%s: structure allocation for windowName failed.\n",
-	    progname);
-    exit(-1);
-  }
+    Error(ERR_EXIT, "structure allocation for windowName failed");
 
   if (!XStringListToTextProperty(&icon_name, 1, &iconName))
-  {
-    fprintf(stderr, "%s: structure allocation for iconName failed.\n",
-	    progname);
-    exit(-1);
-  }
+    Error(ERR_EXIT, "structure allocation for iconName failed");
 
   wm_hints.initial_state = NormalState;
   wm_hints.input = True;
@@ -506,7 +350,7 @@ void InitWindow(int argc, char *argv[])
   wm_hints.icon_mask = iconmask_pixmap;
   wm_hints.flags = StateHint | IconPixmapHint | IconMaskHint | InputHint;
 
-  class_hints.res_name = progname;
+  class_hints.res_name = program_name;
   class_hints.res_class = "Rocks'n'Diamonds";
 
   XSetWMProperties(display, window, &windowName, &iconName, 
@@ -605,6 +449,7 @@ void InitGfx()
     { GFX_GEBLUBBER, 4 },
     { GFX_DYNAMIT, 7 },
     { GFX_DYNABOMB, 4 },
+    { GFX_EXPLOSION, 8 },
     { GFX_SOKOBAN_OBJEKT, 1 },
     { GFX_FUNKELN_BLAU, 3 },
     { GFX_FUNKELN_WEISS, 3 },
@@ -705,13 +550,9 @@ void InitGfx()
   }
 
   if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
-  {
-    fprintf(stderr, "%s: cannot create additional Pixmaps!\n",progname);
-    CloseAll();
-    exit(-1);
-  }
+    Error(ERR_EXIT, "cannot create additional pixmaps");
 
-  for(i=0;i<NUM_PIXMAPS;i++)
+  for(i=0; i<NUM_PIXMAPS; i++)
   {
     if (clipmask[i])
     {
@@ -786,21 +627,13 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
     switch(xpm_err)
     {
       case XpmOpenFailed:
-        fprintf(stderr,"Cannot open Xpm file '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "cannot open XPM file '%s'", filename);
       case XpmFileInvalid:
-	fprintf(stderr,"Invalid Xpm file '%s'!\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "invalid XPM file '%s'", filename);
       case XpmNoMemory:
-	fprintf(stderr,"Not enough memory for Xpm file '%s'!\n",filename);
-	CloseAll();
-	exit(1);
+	Error(ERR_EXIT, "not enough memory for XPM file '%s'", filename);
       case XpmColorFailed:
-	fprintf(stderr,"Can't get colors for Xpm file '%s'!\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "cannot get colors for XPM file '%s'", filename);
       default:
 	break;
     }
@@ -821,25 +654,15 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
       case GIF_Success:
         break;
       case GIF_OpenFailed:
-        fprintf(stderr,"Cannot open GIF file '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
+        Error(ERR_EXIT, "cannot open GIF file '%s'", filename);
       case GIF_ReadFailed:
-        fprintf(stderr,"Cannot read GIF file '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
+        Error(ERR_EXIT, "cannot read GIF file '%s'", filename);
       case GIF_FileInvalid:
-	fprintf(stderr,"Invalid GIF file '%s'!\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "invalid GIF file '%s'", filename);
       case GIF_NoMemory:
-	fprintf(stderr,"Not enough memory for GIF file '%s'!\n",filename);
-	CloseAll();
-	exit(1);
+	Error(ERR_EXIT, "not enough memory for GIF file '%s'", filename);
       case GIF_ColorFailed:
-	fprintf(stderr,"Can't get colors for GIF file '%s'!\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "cannot get colors for GIF file '%s'", filename);
       default:
 	break;
     }
@@ -853,12 +676,7 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
 #endif
 
     if (!pix[pos])
-    {
-      fprintf(stderr, "%s: cannot get graphics for '%s'.\n",
-	      progname, pic->picture_filename);
-      CloseAll();
-      exit(-1);
-    }
+      Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
   }
 
   /* zugehörige Maske laden (wenn vorhanden) */
@@ -883,19 +701,11 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
       case BitmapSuccess:
         break;
       case BitmapOpenFailed:
-	fprintf(stderr,"Bitmap file open failed on '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
-	break;
+	Error(ERR_EXIT, "cannot open XBM file '%s'", filename);
       case BitmapFileInvalid:
-	fprintf(stderr,"Bitmap file invalid: '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
-	break;
+	Error(ERR_EXIT, "invalid XBM file '%s'", filename);
       case BitmapNoMemory:
-	fprintf(stderr,"No memory for file '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "not enough memory for XBM file '%s'", filename);
 	break;
       default:
 	break;
@@ -910,12 +720,7 @@ void LoadGfx(int pos, struct PictureFileInfo *pic)
 #endif
 
     if (!clipmask[pos])
-    {
-      fprintf(stderr, "%s: cannot get clipmask for '%s'.\n",
-	      progname, pic->picture_filename);
-      CloseAll();
-      exit(-1);
-    }
+      Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
   }
 }
 
@@ -969,6 +774,9 @@ void InitElementProperties()
     EL_BETON,
     EL_MAUERWERK,
     EL_MAUER_LEBT,
+    EL_MAUER_X,
+    EL_MAUER_Y,
+    EL_MAUER_XY,
     EL_FELSBODEN,
     EL_AUSGANG_ZU,
     EL_AUSGANG_ACT,
@@ -1070,6 +878,9 @@ void InitElementProperties()
     EL_MAUERWERK,
     EL_FELSBODEN,
     EL_MAUER_LEBT,
+    EL_MAUER_X,
+    EL_MAUER_Y,
+    EL_MAUER_XY,
     EL_MAUERND
   };
   static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
@@ -1457,17 +1268,17 @@ void InitElementProperties()
   };
   static int num_properties = sizeof(ep_num)/sizeof(int *);
 
-  for(i=0;i<MAX_ELEMENTS;i++)
+  for(i=0; i<MAX_ELEMENTS; i++)
     Elementeigenschaften[i] = 0;
 
-  for(i=0;i<num_properties;i++)
-    for(j=0;j<*(ep_num[i]);j++)
+  for(i=0; i<num_properties; i++)
+    for(j=0; j<*(ep_num[i]); j++)
       Elementeigenschaften[(ep_array[i])[j]] |= ep_bit[i];
-  for(i=EL_CHAR_START;i<EL_CHAR_END;i++)
+  for(i=EL_CHAR_START; i<EL_CHAR_END; i++)
     Elementeigenschaften[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }
 
-void CloseAll()
+void CloseAllAndExit(int exit_value)
 {
   int i;
 
@@ -1478,7 +1289,7 @@ void CloseAll()
     FreeSounds(NUM_SOUNDS);
   }
 
-  for(i=0;i<NUM_PIXMAPS;i++)
+  for(i=0; i<NUM_PIXMAPS; i++)
   {
     if (pix[i])
     {
@@ -1507,5 +1318,5 @@ void CloseAll()
     XCloseDisplay(display);
   }
 
-  exit(0);
+  exit(exit_value);
 }